Cleaned up controllers as it reduces deployment time