Cleanup for view-agnosticism.