More view cleanup.