some cleanup work to power api