Move stringSet to util.StringSet