Cleanup to remove use of taxonomy for groups