Removed the use of OrderedDict which wasn't required