Revert "Improved database module"
This reverts commit 9868fb5c5694862e094f5eff525987d6779434bb.