Remove ordered dictionary

Using .NET implementation of OrderedDictionary rather than custom.