cleanup infra pwr_control
Merge pull request #150 from dajohnso/cleanup_infra_pwrctl

cleanup infra pwr_control