Remove OrderedDict and valid input format