Remove last usages of underscore