Removed some non-core enums.