Merge pull request #465 from Perksey/remove-groups

Remove groups