Feature/hydrasir 290 dont remove self from group