remove use of uuids