Revert "Clean feedback controller"

This reverts commit b81f31e2e106cff8765d91f6928aaceea12d3f63.