eliminated remaining enums