Directing working, and removed unused imports