Removed Underscore.String dependency