Removing redundant stuff in front end controller