Changes:

Remove some stuff from the controller, remove the stuff