Refactoring import manager ,cleanup