house tidying
Removed uneeded controllers
Added new controllers