Removed System.Diagnostic calls