Remove extraneous else conditionals