MVC structure refactored to remove dead code