Fix remove feature
Fix remove feature