Removing unused imports, which where left during refactoring.