power flow cleanups