Removed definitions from the controller