Revert "+ Updates to db generator"

This reverts commit 107d19e38a5bd4b869bc122e24ea594fb42a4dce.