Cleanup import refactoring