cleaned up group service