BS-8611, refactor import to avoid duplication and handle new import strategy
BS-8611, remove useless code