Fix remove methods