Remove OrderedDict use