Cut out excessive escape clauses