Refactor - removed uneeded controllers and views