Remove unnecessary else clauses