removed excess controller code