Remove GUID and refactoring update mode