Remove some redundant clauses