Fixed cleaning up groups