More cleanup [skip CI]
More cleanup [skip CI]


Former-commit-id: bbc8cb1f8ba14dcfa981530e87d3937c0145b3c9 [formerly bbc8cb1f8ba14dcfa981530e87d3937c0145b3c9 [formerly fdb0a72570b9bb1afe98ab1711e2392d71cbd7b0]]
Former-commit-id: 6b2638068a2978e6ca1c9be27a6104a9f7a92546
Former-commit-id: 951f089c022b2a83dcd609fc4f1a147cb726b691
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine