removed some redundant code from a merge
removed some redundant code from a merge


Former-commit-id: d3ac007d65068d8662bae7e586237ca360dd6ce5 [formerly 07d02861a9438c4bbd3328eacbac7acedc9ff0a0]
Former-commit-id: 779e9e7ffd93c06de9fdce7239ee7791ab02f4fb
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine