Removal of old non-MVC code that was commented out anyway