Clean up some debug code