Cleanup, convert to UUIDs