Removed OrderedSet as it's no longer required