WIP
Remove groups support

Fixes #1