powerflow cleanups