cleaned up the last two enums in userland