Removed some methods from controller and updated.