remove excess conditional.