diff --git a/src/CodeProject.ObjectPool/CodeProject.ObjectPool.csproj b/src/CodeProject.ObjectPool/CodeProject.ObjectPool.csproj
index 4a0b1be..743f684 100644
--- a/src/CodeProject.ObjectPool/CodeProject.ObjectPool.csproj
+++ b/src/CodeProject.ObjectPool/CodeProject.ObjectPool.csproj
@@ -33,22 +33,27 @@
     <None Remove="doc\**" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Thrower" Version="4.1.3" />
-  </ItemGroup>
-
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.0' ">
     <DefineConstants>$(DefineConstants);NETSTD10;LIBLOG_PORTABLE</DefineConstants>
     <PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
   </PropertyGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.0' ">
+    <PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
+  </ItemGroup>
+
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
     <DefineConstants>$(DefineConstants);NETSTD13;LIBLOG_PORTABLE</DefineConstants>
     <PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
   </PropertyGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
+    <PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
+    <PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
+  </ItemGroup>
+
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net35' ">
-    <DefineConstants>$(DefineConstants);NET35</DefineConstants>
+    <DefineConstants>$(DefineConstants);NET35;HAS_SERIALIZABLE</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
@@ -56,7 +61,7 @@
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net40' ">
-    <DefineConstants>$(DefineConstants);NET40</DefineConstants>
+    <DefineConstants>$(DefineConstants);NET40;HAS_SERIALIZABLE</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
@@ -65,7 +70,7 @@
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
-    <DefineConstants>$(DefineConstants);NET45</DefineConstants>
+    <DefineConstants>$(DefineConstants);NET45;HAS_SERIALIZABLE</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
diff --git a/src/CodeProject.ObjectPool/ParameterizedObjectPool.cs b/src/CodeProject.ObjectPool/ParameterizedObjectPool.cs
index 925f796..abb54b7 100644
--- a/src/CodeProject.ObjectPool/ParameterizedObjectPool.cs
+++ b/src/CodeProject.ObjectPool/ParameterizedObjectPool.cs
@@ -9,7 +9,6 @@
  */
 
 using CodeProject.ObjectPool.Core;
-using PommaLabs.Thrower;
 using System;
 using System.Diagnostics;
 using System.Linq;
@@ -69,7 +68,7 @@ public int MaximumPoolSize
             set
             {
                 // Preconditions
-                Raise.ArgumentOutOfRangeException.If(value < 1, nameof(value), ErrorMessages.NegativeOrZeroMaximumPoolSize);
+                if (value < 1) throw new ArgumentOutOfRangeException(nameof(value), ErrorMessages.NegativeOrZeroMaximumPoolSize);
 
                 _maximumPoolSize = value;
             }
@@ -123,7 +122,7 @@ public ParameterizedObjectPool(Func<TKey, TValue> factoryMethod)
         public ParameterizedObjectPool(int maximumPoolSize, Func<TKey, TValue> factoryMethod)
         {
             // Preconditions
-            Raise.ArgumentOutOfRangeException.If(maximumPoolSize < 1, nameof(maximumPoolSize), ErrorMessages.NegativeOrZeroMaximumPoolSize);
+            if (maximumPoolSize < 1) throw new ArgumentOutOfRangeException(nameof(maximumPoolSize), ErrorMessages.NegativeOrZeroMaximumPoolSize);
 
             // Assigning properties
             Diagnostics = new ObjectPoolDiagnostics();
diff --git a/src/CodeProject.ObjectPool/PooledObject.cs b/src/CodeProject.ObjectPool/PooledObject.cs
index 1ceb2b4..b0d57b3 100644
--- a/src/CodeProject.ObjectPool/PooledObject.cs
+++ b/src/CodeProject.ObjectPool/PooledObject.cs
@@ -9,13 +9,12 @@
  */
 
 using CodeProject.ObjectPool.Core;
-using PommaLabs.Thrower.Goodies;
 using System;
 using System.Collections.Generic;
 
 #if !NET35
 
-using PommaLabs.Thrower.Logging;
+using CodeProject.ObjectPool.Logging;
 
 #endif
 
@@ -24,8 +23,11 @@ namespace CodeProject.ObjectPool
     /// <summary>
     ///   PooledObject base class.
     /// </summary>
+#if HAS_SERIALIZABLE
     [Serializable]
-    public abstract class PooledObject : EquatableObject<PooledObject>, IDisposable
+#endif
+
+    public abstract class PooledObject : IDisposable, IEquatable<PooledObject>
     {
         #region Logging
 
@@ -190,34 +192,39 @@ private void HandleReAddingToPool(bool reRegisterForFinalization)
 
         #region Formatting and equality
 
-        /// <summary>
-        ///   Returns all property (or field) values, along with their names, so that they can be
-        ///   used to produce a meaningful <see cref="object.ToString"/>.
-        /// </summary>
-        /// <returns>
-        ///   All property (or field) values, along with their names, so that they can be used to
-        ///   produce a meaningful <see cref="object.ToString"/>.
-        /// </returns>
-        protected override IEnumerable<KeyValuePair<string, object>> GetFormattingMembers()
-        {
-            yield return new KeyValuePair<string, object>(nameof(PooledObjectInfo.Id), PooledObjectInfo.Id);
-            if (PooledObjectInfo.Payload != null)
-            {
-                yield return new KeyValuePair<string, object>(nameof(PooledObjectInfo.Payload), PooledObjectInfo.Payload);
-            }
-        }
-
-        /// <summary>
-        ///   Returns all property (or field) values that should be used inside
-        ///   <see cref="IEquatable{T}.Equals(T)"/> or <see cref="object.GetHashCode"/>.
-        /// </summary>
-        /// <returns>
-        ///   All property (or field) values that should be used inside
-        ///   <see cref="IEquatable{T}.Equals(T)"/> or <see cref="object.GetHashCode"/>.
-        /// </returns>
-        protected override IEnumerable<object> GetIdentifyingMembers()
+        ///// <summary>
+        /////   Returns all property (or field) values, along with their names, so that they can be
+        /////   used to produce a meaningful <see cref="object.ToString"/>.
+        ///// </summary>
+        ///// <returns>
+        /////   All property (or field) values, along with their names, so that they can be used to
+        /////   produce a meaningful <see cref="object.ToString"/>.
+        ///// </returns>
+        //protected override IEnumerable<KeyValuePair<string, object>> GetFormattingMembers()
+        //{
+        //    yield return new KeyValuePair<string, object>(nameof(PooledObjectInfo.Id), PooledObjectInfo.Id);
+        //    if (PooledObjectInfo.Payload != null)
+        //    {
+        //        yield return new KeyValuePair<string, object>(nameof(PooledObjectInfo.Payload), PooledObjectInfo.Payload);
+        //    }
+        //}
+
+        ///// <summary>
+        /////   Returns all property (or field) values that should be used inside
+        /////   <see cref="IEquatable{T}.Equals(T)"/> or <see cref="object.GetHashCode"/>.
+        ///// </summary>
+        ///// <returns>
+        /////   All property (or field) values that should be used inside
+        /////   <see cref="IEquatable{T}.Equals(T)"/> or <see cref="object.GetHashCode"/>.
+        ///// </returns>
+        //protected override IEnumerable<object> GetIdentifyingMembers()
+        //{
+        //    yield return PooledObjectInfo.Id;
+        //}
+
+        public bool Equals(PooledObject other)
         {
-            yield return PooledObjectInfo.Id;
+            throw new NotImplementedException();
         }
 
         #endregion Formatting and equality
diff --git a/src/CodeProject.ObjectPool/PooledObjectWrapper.cs b/src/CodeProject.ObjectPool/PooledObjectWrapper.cs
index 9c1ce86..eb84d1c 100644
--- a/src/CodeProject.ObjectPool/PooledObjectWrapper.cs
+++ b/src/CodeProject.ObjectPool/PooledObjectWrapper.cs
@@ -9,7 +9,6 @@
  */
 
 using CodeProject.ObjectPool.Core;
-using PommaLabs.Thrower;
 using System;
 
 namespace CodeProject.ObjectPool
@@ -17,7 +16,10 @@ namespace CodeProject.ObjectPool
     /// <summary>
     ///   PooledObject wrapper, for classes which cannot inherit from that class.
     /// </summary>
+#if HAS_SERIALIZABLE
     [Serializable]
+#endif
+
     public sealed class PooledObjectWrapper<T> : PooledObject where T : class
     {
         /// <summary>
@@ -27,10 +29,7 @@ public sealed class PooledObjectWrapper<T> : PooledObject where T : class
         /// <exception cref="ArgumentNullException">Given resource is null.</exception>
         public PooledObjectWrapper(T resource)
         {
-            // Preconditions
-            Raise.ArgumentNullException.IfIsNull(resource, nameof(resource), ErrorMessages.NullResource);
-
-            InternalResource = resource;
+            InternalResource = resource ?? throw new ArgumentNullException(nameof(resource), ErrorMessages.NullResource);
 
             base.OnReleaseResources += () => OnReleaseResources?.Invoke(InternalResource);
             base.OnResetState += () => OnResetState?.Invoke(InternalResource);
diff --git a/src/CodeProject.ObjectPool/TimedObjectPool.cs b/src/CodeProject.ObjectPool/TimedObjectPool.cs
index 45677d0..05d5ddd 100644
--- a/src/CodeProject.ObjectPool/TimedObjectPool.cs
+++ b/src/CodeProject.ObjectPool/TimedObjectPool.cs
@@ -24,7 +24,6 @@
 #if !NETSTD10
 
 using CodeProject.ObjectPool.Core;
-using PommaLabs.Thrower;
 using System;
 using System.Linq;
 using System.Threading;
@@ -109,7 +108,7 @@ public TimedObjectPool(Func<T> factoryMethod, TimeSpan timeout)
         public TimedObjectPool(int maximumPoolSize, Func<T> factoryMethod, TimeSpan timeout) : base(maximumPoolSize, factoryMethod)
         {
             // Preconditions
-            Raise.ArgumentOutOfRangeException.IfIsLessOrEqual(timeout, TimeSpan.Zero, nameof(timeout), ErrorMessages.NegativeOrZeroTimeout);
+            if (timeout <= TimeSpan.Zero) throw new ArgumentOutOfRangeException(nameof(timeout), ErrorMessages.NegativeOrZeroTimeout);
 
             // Assigning properties.
             Timeout = timeout;