Revert "fixed after merge conflict + add fillDb script"

This reverts commit 74c06b5d999395b90c87d3066eff81b15f40216f.