More cleanup [skip hazardlib]
More cleanup [skip hazardlib]


Former-commit-id: de121b18bda7fe66b748ac1f61053465a4e945ee [formerly 85fdaa1c41266513303d3b7e96cbe54be6642493]
Former-commit-id: 746d25b2c74fb3b5ac8de597e034ba60f90fb262
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine