Remove global scope polution