Removal of old db references.  close #313