Revert "more db stuff"

This reverts commit 15cb0e1447e431ad2486955cbd8d18d74f671dd4.