CDB-2968 fixed more problems with import table cleanup flow + specs