Fix codes, removed logs