Remove use of GLOBAL
Commiting some other's changes