diff --git a/Net.Http.WebApi.OData/Model/EdmComplexType.cs b/Net.Http.WebApi.OData/Model/EdmComplexType.cs
index 262a232..edba1ba 100644
--- a/Net.Http.WebApi.OData/Model/EdmComplexType.cs
+++ b/Net.Http.WebApi.OData/Model/EdmComplexType.cs
@@ -49,7 +49,7 @@ internal EdmComplexType(Type clrType, EdmType baseType, IReadOnlyList<EdmPropert
         /// </summary>
         /// <param name="name">The name of the property.</param>
         /// <returns>The <see cref="EdmProperty"/> declared in this type with the specified name.</returns>
-        /// <exception cref="System.ArgumentException">The type does not contain a property with the specified name.</exception>
+        /// <exception cref="ArgumentException">The type does not contain a property with the specified name.</exception>
         public EdmProperty GetProperty(string name)
         {
             for (int i = 0; i < this.Properties.Count; i++)
diff --git a/Net.Http.WebApi.OData/Model/EdmProperty.cs b/Net.Http.WebApi.OData/Model/EdmProperty.cs
index a192455..1cafdde 100644
--- a/Net.Http.WebApi.OData/Model/EdmProperty.cs
+++ b/Net.Http.WebApi.OData/Model/EdmProperty.cs
@@ -26,8 +26,8 @@ public sealed class EdmProperty
         /// <param name="name">The name of the property.</param>
         /// <param name="propertyType">Type of the edm.</param>
         /// <param name="declaringType">Type of the declaring.</param>
-        /// <exception cref="System.ArgumentException">Property name must be specified.</exception>
-        /// <exception cref="System.ArgumentNullException">Property type and declaring type must be specified.</exception>
+        /// <exception cref="ArgumentException">Property name must be specified.</exception>
+        /// <exception cref="ArgumentNullException">Property type and declaring type must be specified.</exception>
         internal EdmProperty(string name, EdmType propertyType, EdmComplexType declaringType)
         {
             if (string.IsNullOrWhiteSpace(name))
diff --git a/Net.Http.WebApi.OData/Query/Binders/AbstractFilterBinder.cs b/Net.Http.WebApi.OData/Query/Binders/AbstractFilterBinder.cs
index 7bf4c21..fbea61b 100644
--- a/Net.Http.WebApi.OData/Query/Binders/AbstractFilterBinder.cs
+++ b/Net.Http.WebApi.OData/Query/Binders/AbstractFilterBinder.cs
@@ -50,7 +50,7 @@ public void Bind(FilterQueryOption filterQueryOption)
         /// Binds the specified <see cref="QueryNode"/>.
         /// </summary>
         /// <param name="queryNode">The <see cref="QueryNode"/> to bind.</param>
-        /// <exception cref="System.NotSupportedException">Thrown if the <see cref="QueryNodeKind"/> is not supported.</exception>
+        /// <exception cref="NotSupportedException">Thrown if the <see cref="QueryNodeKind"/> is not supported.</exception>
         protected void Bind(QueryNode queryNode)
         {
             if (queryNode is null)
diff --git a/Net.Http.WebApi.OData/Query/QueryOption.cs b/Net.Http.WebApi.OData/Query/QueryOption.cs
index c911a66..f18d0ac 100644
--- a/Net.Http.WebApi.OData/Query/QueryOption.cs
+++ b/Net.Http.WebApi.OData/Query/QueryOption.cs
@@ -24,7 +24,7 @@ public abstract class QueryOption
         /// Initialises a new instance of the <see cref="QueryOption"/> class.
         /// </summary>
         /// <param name="rawValue">The raw value.</param>
-        /// <exception cref="System.ArgumentNullException">Thrown if raw value is null.</exception>
+        /// <exception cref="ArgumentNullException">Thrown if raw value is null.</exception>
         protected QueryOption(string rawValue)
         {
             this.RawValue = rawValue ?? throw new ArgumentNullException(nameof(rawValue));
diff --git a/Net.Http.WebApi.OData/Query/Validators/CountQueryOptionValidator.cs b/Net.Http.WebApi.OData/Query/Validators/CountQueryOptionValidator.cs
index 4d3d053..69aa670 100644
--- a/Net.Http.WebApi.OData/Query/Validators/CountQueryOptionValidator.cs
+++ b/Net.Http.WebApi.OData/Query/Validators/CountQueryOptionValidator.cs
@@ -13,7 +13,6 @@
 namespace Net.Http.WebApi.OData.Query.Validators
 {
     using System.Net;
-    using System.Web.Http;
 
     /// <summary>
     /// A class which validates the $count query option based upon the <see cref="ODataValidationSettings"/>.
@@ -25,7 +24,7 @@ internal static class CountQueryOptionValidator
         /// </summary>
         /// <param name="queryOptions">The query options.</param>
         /// <param name="validationSettings">The validation settings.</param>
-        /// <exception cref="HttpResponseException">Thrown if the validation fails.</exception>
+        /// <exception cref="ODataException">Thrown if the validation fails.</exception>
         internal static void Validate(ODataQueryOptions queryOptions, ODataValidationSettings validationSettings)
         {
             if (queryOptions.RawValues.Count is null)
diff --git a/Net.Http.WebApi.OData/Query/Validators/ExpandQueryOptionValidator.cs b/Net.Http.WebApi.OData/Query/Validators/ExpandQueryOptionValidator.cs
index 4cb6c92..24c688f 100644
--- a/Net.Http.WebApi.OData/Query/Validators/ExpandQueryOptionValidator.cs
+++ b/Net.Http.WebApi.OData/Query/Validators/ExpandQueryOptionValidator.cs
@@ -13,7 +13,6 @@
 namespace Net.Http.WebApi.OData.Query.Validators
 {
     using System.Net;
-    using System.Web.Http;
 
     /// <summary>
     /// A class which validates the $expand query option based upon the <see cref="ODataValidationSettings"/>.
@@ -25,7 +24,7 @@ internal static class ExpandQueryOptionValidator
         /// </summary>
         /// <param name="queryOptions">The query options.</param>
         /// <param name="validationSettings">The validation settings.</param>
-        /// <exception cref="HttpResponseException">Thrown if the validation fails.</exception>
+        /// <exception cref="ODataException">Thrown if the validation fails.</exception>
         internal static void Validate(ODataQueryOptions queryOptions, ODataValidationSettings validationSettings)
         {
             if (queryOptions.RawValues.Expand is null)
diff --git a/Net.Http.WebApi.OData/Query/Validators/FilterQueryOptionValidator.cs b/Net.Http.WebApi.OData/Query/Validators/FilterQueryOptionValidator.cs
index 6a2b969..76a3a27 100644
--- a/Net.Http.WebApi.OData/Query/Validators/FilterQueryOptionValidator.cs
+++ b/Net.Http.WebApi.OData/Query/Validators/FilterQueryOptionValidator.cs
@@ -13,7 +13,6 @@
 namespace Net.Http.WebApi.OData.Query.Validators
 {
     using System.Net;
-    using System.Web.Http;
 
     /// <summary>
     /// A class which validates the $filter query option based upon the <see cref="ODataValidationSettings"/>.
@@ -25,7 +24,7 @@ internal static class FilterQueryOptionValidator
         /// </summary>
         /// <param name="queryOptions">The query options.</param>
         /// <param name="validationSettings">The validation settings.</param>
-        /// <exception cref="HttpResponseException">Thrown if the validation fails.</exception>
+        /// <exception cref="ODataException">Thrown if the validation fails.</exception>
         internal static void Validate(ODataQueryOptions queryOptions, ODataValidationSettings validationSettings)
         {
             if (queryOptions.Filter is null)
diff --git a/Net.Http.WebApi.OData/Query/Validators/FormatQueryOptionValidator.cs b/Net.Http.WebApi.OData/Query/Validators/FormatQueryOptionValidator.cs
index f815be1..3817ec2 100644
--- a/Net.Http.WebApi.OData/Query/Validators/FormatQueryOptionValidator.cs
+++ b/Net.Http.WebApi.OData/Query/Validators/FormatQueryOptionValidator.cs
@@ -13,7 +13,6 @@
 namespace Net.Http.WebApi.OData.Query.Validators
 {
     using System.Net;
-    using System.Web.Http;
 
     /// <summary>
     /// A class which validates the $format query option based upon the <see cref="ODataValidationSettings"/>.
@@ -25,7 +24,7 @@ internal static class FormatQueryOptionValidator
         /// </summary>
         /// <param name="queryOptions">The query options.</param>
         /// <param name="validationSettings">The validation settings.</param>
-        /// <exception cref="HttpResponseException">Thrown if the validation fails.</exception>
+        /// <exception cref="ODataException">Thrown if the validation fails.</exception>
         internal static void Validate(ODataQueryOptions queryOptions, ODataValidationSettings validationSettings)
         {
             if (queryOptions.RawValues.Format is null)
diff --git a/Net.Http.WebApi.OData/Query/Validators/OrderByQueryOptionValidator.cs b/Net.Http.WebApi.OData/Query/Validators/OrderByQueryOptionValidator.cs
index 421ac02..ff1cf30 100644
--- a/Net.Http.WebApi.OData/Query/Validators/OrderByQueryOptionValidator.cs
+++ b/Net.Http.WebApi.OData/Query/Validators/OrderByQueryOptionValidator.cs
@@ -13,7 +13,6 @@
 namespace Net.Http.WebApi.OData.Query.Validators
 {
     using System.Net;
-    using System.Web.Http;
 
     /// <summary>
     /// A class which validates the $orderby query option based upon the <see cref="ODataValidationSettings"/>.
@@ -25,7 +24,7 @@ internal static class OrderByQueryOptionValidator
         /// </summary>
         /// <param name="queryOptions">The query options.</param>
         /// <param name="validationSettings">The validation settings.</param>
-        /// <exception cref="HttpResponseException">Thrown if the validation fails.</exception>
+        /// <exception cref="ODataException">Thrown if the validation fails.</exception>
         internal static void Validate(ODataQueryOptions queryOptions, ODataValidationSettings validationSettings)
         {
             if (queryOptions.RawValues.OrderBy is null)
diff --git a/Net.Http.WebApi.OData/Query/Validators/SearchQueryOptionValidator.cs b/Net.Http.WebApi.OData/Query/Validators/SearchQueryOptionValidator.cs
index 85039fc..f1e25fa 100644
--- a/Net.Http.WebApi.OData/Query/Validators/SearchQueryOptionValidator.cs
+++ b/Net.Http.WebApi.OData/Query/Validators/SearchQueryOptionValidator.cs
@@ -13,7 +13,6 @@
 namespace Net.Http.WebApi.OData.Query.Validators
 {
     using System.Net;
-    using System.Web.Http;
 
     /// <summary>
     /// A class which validates the $search query option based upon the <see cref="ODataValidationSettings"/>.
@@ -25,7 +24,7 @@ internal static class SearchQueryOptionValidator
         /// </summary>
         /// <param name="queryOptions">The query options.</param>
         /// <param name="validationSettings">The validation settings.</param>
-        /// <exception cref="HttpResponseException">Thrown if the validation fails.</exception>
+        /// <exception cref="ODataException">Thrown if the validation fails.</exception>
         internal static void Validate(ODataQueryOptions queryOptions, ODataValidationSettings validationSettings)
         {
             if (queryOptions.RawValues.Search is null)
diff --git a/Net.Http.WebApi.OData/Query/Validators/SelectQueryOptionValidator.cs b/Net.Http.WebApi.OData/Query/Validators/SelectQueryOptionValidator.cs
index b140a1e..8abd552 100644
--- a/Net.Http.WebApi.OData/Query/Validators/SelectQueryOptionValidator.cs
+++ b/Net.Http.WebApi.OData/Query/Validators/SelectQueryOptionValidator.cs
@@ -13,7 +13,6 @@
 namespace Net.Http.WebApi.OData.Query.Validators
 {
     using System.Net;
-    using System.Web.Http;
 
     /// <summary>
     /// A class which validates the $select query option based upon the <see cref="ODataValidationSettings"/>.
@@ -25,7 +24,7 @@ internal static class SelectQueryOptionValidator
         /// </summary>
         /// <param name="queryOptions">The query options.</param>
         /// <param name="validationSettings">The validation settings.</param>
-        /// <exception cref="HttpResponseException">Thrown if the validation fails.</exception>
+        /// <exception cref="ODataException">Thrown if the validation fails.</exception>
         internal static void Validate(ODataQueryOptions queryOptions, ODataValidationSettings validationSettings)
         {
             if (queryOptions.RawValues.Select is null)
diff --git a/Net.Http.WebApi.OData/Query/Validators/SkipQueryOptionValidator.cs b/Net.Http.WebApi.OData/Query/Validators/SkipQueryOptionValidator.cs
index fe78795..30835c2 100644
--- a/Net.Http.WebApi.OData/Query/Validators/SkipQueryOptionValidator.cs
+++ b/Net.Http.WebApi.OData/Query/Validators/SkipQueryOptionValidator.cs
@@ -13,7 +13,6 @@
 namespace Net.Http.WebApi.OData.Query.Validators
 {
     using System.Net;
-    using System.Web.Http;
 
     /// <summary>
     /// A class which validates the $skip query option based upon the <see cref="ODataValidationSettings"/>.
@@ -25,7 +24,7 @@ internal static class SkipQueryOptionValidator
         /// </summary>
         /// <param name="queryOptions">The query options.</param>
         /// <param name="validationSettings">The validation settings.</param>
-        /// <exception cref="HttpResponseException">Thrown if the validation fails.</exception>
+        /// <exception cref="ODataException">Thrown if the validation fails.</exception>
         internal static void Validate(ODataQueryOptions queryOptions, ODataValidationSettings validationSettings)
         {
             if (queryOptions.RawValues.Skip is null)
diff --git a/Net.Http.WebApi.OData/Query/Validators/SkipTokenQueryOptionValidator.cs b/Net.Http.WebApi.OData/Query/Validators/SkipTokenQueryOptionValidator.cs
index d039d46..5f19f98 100644
--- a/Net.Http.WebApi.OData/Query/Validators/SkipTokenQueryOptionValidator.cs
+++ b/Net.Http.WebApi.OData/Query/Validators/SkipTokenQueryOptionValidator.cs
@@ -13,7 +13,6 @@
 namespace Net.Http.WebApi.OData.Query.Validators
 {
     using System.Net;
-    using System.Web.Http;
 
     /// <summary>
     /// A class which validates the $skiptoken query option based upon the <see cref="ODataValidationSettings"/>.
@@ -25,7 +24,7 @@ internal static class SkipTokenQueryOptionValidator
         /// </summary>
         /// <param name="queryOptions">The query options.</param>
         /// <param name="validationSettings">The validation settings.</param>
-        /// <exception cref="HttpResponseException">Thrown if the validation fails.</exception>
+        /// <exception cref="ODataException">Thrown if the validation fails.</exception>
         internal static void Validate(ODataQueryOptions queryOptions, ODataValidationSettings validationSettings)
         {
             if (queryOptions.RawValues.SkipToken is null)
diff --git a/Net.Http.WebApi.OData/Query/Validators/TopQueryOptionValidator.cs b/Net.Http.WebApi.OData/Query/Validators/TopQueryOptionValidator.cs
index c9d44e6..26cd8c8 100644
--- a/Net.Http.WebApi.OData/Query/Validators/TopQueryOptionValidator.cs
+++ b/Net.Http.WebApi.OData/Query/Validators/TopQueryOptionValidator.cs
@@ -14,7 +14,6 @@ namespace Net.Http.WebApi.OData.Query.Validators
 {
     using System.Globalization;
     using System.Net;
-    using System.Web.Http;
 
     /// <summary>
     /// A class which validates the $top query option based upon the <see cref="ODataValidationSettings"/>.
@@ -26,7 +25,7 @@ internal static class TopQueryOptionValidator
         /// </summary>
         /// <param name="queryOptions">The query options.</param>
         /// <param name="validationSettings">The validation settings.</param>
-        /// <exception cref="HttpResponseException">Thrown if the validation fails.</exception>
+        /// <exception cref="ODataException">Thrown if the validation fails.</exception>
         internal static void Validate(ODataQueryOptions queryOptions, ODataValidationSettings validationSettings)
         {
             if (queryOptions.RawValues.Top is null)