Revert "DB changes"

This reverts commit e35da0f242f104a8289dd831c99859852ab2d810.