cleanup some powering code