Removing references to Underscore