Clean up views and templates