mvc/rest cleanup