Removed OrderedDict in the hazard getters
Removed an OrderedDict