Few updates to groups removal script