Fix remove groups