Fix remove method
Precise if statements