begin removing underscore dependency