#653 - clean up after PowerType changes