Drop unnecessary else clauses