Cleaned unused imports, removed unused dependency