removing extra code from hazard fields