More cleaning up views.