issue #42 plus clean up of migration scripts