diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs
index f53cf77f5d..993712f118 100644
--- a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs
+++ b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs
@@ -4,19 +4,17 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Diagnostics.Views;
 using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Http;
 using Microsoft.Extensions.CompilationAbstractions;
-using Microsoft.Extensions.PlatformAbstractions;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.PlatformAbstractions;
 using StackFrame = Microsoft.AspNet.Diagnostics.Views.StackFrame;
 
 namespace Microsoft.AspNet.Diagnostics
@@ -67,7 +65,6 @@ namespace Microsoft.AspNet.Diagnostics
         /// </summary>
         /// <param name="context"></param>
         /// <returns></returns>
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "For diagnostics")]
         public async Task Invoke(HttpContext context)
         {
             try
diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPageModel.cs b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPageModel.cs
index 9ba217b9a6..ce641bc17e 100644
--- a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPageModel.cs
+++ b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPageModel.cs
@@ -26,19 +26,16 @@ namespace Microsoft.AspNet.Diagnostics.Views
         /// <summary>
         /// Parsed query data.
         /// </summary>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly", Justification = "Model class contains collection")]
         public IQueryCollection Query { get; set; }
-        
+
         /// <summary>
         /// Request cookies.
         /// </summary>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly", Justification = "Model class contains collection")]
         public IRequestCookieCollection Cookies { get; set; }
-        
+
         /// <summary>
         /// Request headers.
         /// </summary>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly", Justification = "Model class contains collection")]
         public IDictionary<string, StringValues> Headers { get; set; }
     }
 }