some more cleanup, and turned off debugging