seems like this code would be pretty easy to upgrade to the new UUID support Do we really need to delete it?