Last of the view cruft cleanup for now.

Stores may need some cleanup but that isn't part of this.