Remove UUID check