Made removeGroups
Finalized last changes