enums bug fixes and samples and delete