CDB-1444 #resolve Clean up old importer code
Merge CDB-1444 into release/2.8.2