Update comments accordingly to changes and remove confusing comment where usage is commented elsewhere.