Fixed bugs and removed logs