Clean up mvc