More cleanup
More cleanup


Former-commit-id: a1a884133e2bf99c7035f48ac75804939409c2ab [formerly a138e8b618147153ddadb1abbd1e63d6ea083403]
Former-commit-id: bd53eb60efefd6093e497077227888c053346e95
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine