Clean up view 2