cleaned up the last two enums in userland
Merge branch 'COMP_ADD' into redis-refactor