further cleanup work in mvc