Fix wall powers and clean up PowerManager