Remove superfluous checks when closing database.
Merge branch 'baagaard/master-add-model-usgscencalvm' into baagaard/master

* baagaard/master-add-model-usgscencalvm:
  Remove superfluous checks when closing database.