Remove unneccessary clauses