more data-import phase-3 refactoring