More code to controllers
Removed unnecessary code