Modify Main class to remove UUID