(#1942) - cleanup uuids code