US534 - Remove use of Controller in Global