Cleanup pass over views