Remove confusing clauses