General cleanup on views.