(Menu) Get rid of two enums