Removed unused imports
Big switch from being group-centric => user-centric