Fix remove method