Revert "Structure db"

This reverts commit ccd1140ed968afb72037647c02c0dd8a6af86fbc.