cleanup debug prints and leftovers from old approach