Removed all unused imports in controller pkg