Revert "Add new controllers."

This reverts commit 3e5a39f4abaac3b67cc6b2a0d0837b0e3be928c4.
revert