adding unordered_set
cleaning up shared unordered_map/set code