Some cleanup
Some cleanup


Former-commit-id: 34be043bc78882f41dccb695c4b8e7209a84f63d [formerly 34be043bc78882f41dccb695c4b8e7209a84f63d [formerly 072cae6010b2c64d6d7b0a18325d2cf6e4e0070c]]
Former-commit-id: c46cf57b61fc68f69a8f5355ca655884566bcd6c
Former-commit-id: f45f5a33d53d40279a72305806d9c1e77d961539
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine