Clean up the debug code