More cleanup
More cleanup


Former-commit-id: 63c8df68c17bb996d7d1cba3542181e0154f9faf [formerly 86ade9416c6555e5a6760ea7e6571110d6c455eb]
Former-commit-id: 862eaee2484873d72ff9a6b1be6bd3f4977793d0
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine