Remove more extraneous elses