More cleanup
More cleanup


Former-commit-id: 12a4cc4fae374099ecd781446e7c3850966c10ef [formerly f8742786df52c8c919e1f046cdc28e5e0e2ac35f]
Former-commit-id: e714d36c69e4ccd8a5528481e99d4c26bbdeb090
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine