Fix typos and unused statements
Remove duplicated blocks from migration dict
Merge pull request #336 from giffels/dbs3-migration-hot-fix

Dbs3 migration hot fix