improve groups data deletion