Fix remove method
Fix remove method