Removing unnecesary repeated controllers
WIP