A lot + new db
Revert "A lot + new db"

This reverts commit 8edfbb4a80ac63ccf990706c7370cf4564fa4cf1.