removed some enumerators and placed them in project