Revert "Db improve"

This reverts commit 3ea2e42274ae66fa58053e4ec57d75fc4bde4766.