Removed controllers from global scope