Fix remove()
Fix remove()