Remove remaining references to UUID