Clean up some debug mess