More cleanup
More cleanup


Former-commit-id: 03fc11c78e464dc3bd8c60641386361aceddc140 [formerly 040521c0f20bcd29d3055403ce4cde3894d82dd5]
Former-commit-id: 5e0bf8b73e82cb81e62c7b528444f520cb934ae1
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine