Remove uneeded catch clauses