HOTFIX: remove querying before db creation