Cleanup some debug code