Removed set marker from all diagnostic messages