WIKI-845 remove redundant comments and correct some logs