Cleanup extraneous elses