switched id's to uuid.  Cleanup