Merge "Remove redundant calls and correct some comments." into main