Eliminating safety risk