New cleanups, focusing on views