remove dictionary stack, replace with simple OrderedDict