Cleanup view 2