reformat
remove unused comment
remove the unnecessary changes in cfg