Remove extraneous elses