MVC cleanup