Removing underscore dependency