fix remove conditions