remove old conditional