Revert "db changes final"

This reverts commit 0da2e395343575eb1d8649735e5f8812ef6c471e.