Some cleanup
Some cleanup


Former-commit-id: f3726e9c74be261747e134125caef76597382071 [formerly c1c7d55406f2ec21f14cb010bdf67e215bba2e1f]
Former-commit-id: 5b2ed00e6d3f64c0a876efd1887574136881e890
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine