Cleaned project and removed unused imports