Remove MvcHelper
Update to v6 API's