Some cleanup
Some cleanup


Former-commit-id: dc606802e5839a841a1037f9513142d4990e75d7 [formerly dc606802e5839a841a1037f9513142d4990e75d7 [formerly 398ead7e15168c6ef7002b5ae3031ec1f70d4b43]]
Former-commit-id: 2864ab0d671f1403b22288fb624dca758defa31e
Former-commit-id: 164c2070f9c192060c6c65a3ea73d10aa1f6b76f
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine