Revert "db changes"

This reverts commit a9de2309b946fed3e218bc44293ae1f522d82519.