CS refactoring
removed unused import