removed duplicated uses
fixed regression in add group