[fix] - debug stuff - cleanup