Fixed group remove bugs