Really fix and remove debugging