Merge "remove unused uuid parameter"