Reuse of code from challenge1.
Removing unused module.
Remove duplicated code from challenge1.
Remove dup code, added isDBinInstance to guarantee DB creation.