remove references to underscore
remove references to underscore