Clean up superfluos groups