Remove unneeded else branches

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