Cleanup and simplification of power setup.
Hopefully works better now.