remove debugging, clean up