(Menu) Cleanups pt. 1