removed logs and unused stuff