Clean up debuging code