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


Former-commit-id: f323c3e8242fd0fb83aa5a00f2ba2dfc509d5a17 [formerly bd023a4cf95a0710204ece80824cb8bda78ac6f2] [formerly bd023a4cf95a0710204ece80824cb8bda78ac6f2 [formerly 36d472d0399d5e213ef6373d7af067a41c3cba5c]]
Former-commit-id: f36e04466cabaa1e587e7133523d2e56ee6a0a5a
Former-commit-id: 611f6fda2132c89ce998efccffa0253ff6c56b87
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine