* remove xpenum
* normalize enums
* cleanup