Task #33 do not do db

Fixes #33