Updated addUser and removeUser so they do not proxy to addUsers, removeUsers in order to minimize merge issues.