(Menu) Cleanups
Remove extraneous elses in input code