tidy up groups