More MVC cleanup