Cleanup of global scope
Cleanup of more global scope