Cleanup the global namespace slightly