Clean up.
Continue refactoring towards single point of power control.