Remove unneeded else branches

Making a pull request for this since it is very subjective.