Merge "Remove the obsolete comments and change the misleading var name."