Remove psuedo-MVC support