Revert "Groups add/delete"

This reverts commit 8192eae0834d49f55bd0ab3793f0de9ab444d420.