WIP - Improvements to groups

Remove this method