Removed need for this in controller