Fix remove finding