(Menu) Cleanup some unused variables