get rid of the enums