Adding deletion of the keys of the removed group

Change-Id: I741f6f563392ad4605d934bc4141df91993cef29