Fix remove and get