Remove unused imports 2