fix and optimize import destruction