Added group removal (with metadata removal)