Remove use of GLOBAL for now