Fix remove command