Some cleanup [skip CI]
Some cleanup [skip CI]


Former-commit-id: e3c0d73ea02e809796ad7406e32708baf47e2953 [formerly e3c0d73ea02e809796ad7406e32708baf47e2953 [formerly 1ae555f8b1275ac480c84d923baa0d6128a8b058]]
Former-commit-id: 0ad8b25bc62bc9ccddd77d08f3626b3356645845
Former-commit-id: 2308b70f450c520106a1be2d6e3e584ab1d7090c
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine