Clean and simplify import generation process.