Revert "Revert "Revert "Remove PID Controls"""