Added missing deps. Removed unused imports