Removed anything related to group