Cleanup and added commands to add/remove UUIDs