Refactored
Removed used controllers