Remove unneeded else clauses