Delete implemented more. Fixed some UUID conversion issues