Removed unused controllers.
Merge