Remove py2.7 OrderedDict usage