Added group removal option