Hazard elimination