Partial revert of "Clean up PWM"

Still need some of this... for now