Removed logs and unused imports