More cleanup

Simplifying systems in advance of v8 rollout