#4137 MVC cleanup