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


Former-commit-id: b95f28637190102e1a7dafab30220462982a6426 [formerly 99093be57bca7984dcdd51daac4e237262790bbd] [formerly 99093be57bca7984dcdd51daac4e237262790bbd [formerly c252f9792fb8940ecb16336d2ed25f942a2552cb]]
Former-commit-id: 005ea58052755574b54fd04631299770470e883e
Former-commit-id: ea6c86850a383a4610a4ed01f8710dcc65dc76c6
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine