Slow movement to clean up control code

Progressively moving old interfaces