Remove uniqueId attribute from entities