Get rid of auto-created groups