Revert "DB Changes"

This reverts commit e29f60cf1da38288f52564739c08a4f45465c1d8.