(Menu) Some cleanups