Cleaning up some debug output