(Menu) Get rid of more enums