refactored out unnecessary Groups