Revert partially previous commit

Remove import statement refactorization