Remove uniquifier function