Some cleanup
Some cleanup


Former-commit-id: 91932f1cf882bbd4568b4593f4b43caf1c1da562 [formerly 91932f1cf882bbd4568b4593f4b43caf1c1da562 [formerly 2de0f1887b102f5d6e38bafb5c11fd42ba5b6353]]
Former-commit-id: 1d534c396b84f246f720d767d9474fe783a51f05
Former-commit-id: cf84d9bc116626dfb63b94aca681e8452dbaff9e
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine