Remove OrderedHash dependency