Remove requires for removed classes
Remove references to OrderedHash