Clean up the global object a bit