These enums should no longer be needed