removed logs and unused code