Remove superfluous conditional clauses