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


Former-commit-id: 07d02861a9438c4bbd3328eacbac7acedc9ff0a0
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine