diff --git a/PocketSharp/APIException.cs b/PocketSharp/APIException.cs
index aef1a70..ddbe4b7 100644
--- a/PocketSharp/APIException.cs
+++ b/PocketSharp/APIException.cs
@@ -1,5 +1,4 @@
-using RestSharp;
-using System;
+using System;
 using System.Runtime.Serialization;
 
 namespace PocketSharp
@@ -7,7 +6,6 @@ namespace PocketSharp
   /// <summary>
   /// custom Pocket API Exceptions
   /// </summary>
-  [Serializable]
   public class APIException : Exception
   {
     /// <summary>
diff --git a/PocketSharp/Components/Add.cs b/PocketSharp/Components/Add.cs
index 433a5ef..7622c72 100644
--- a/PocketSharp/Components/Add.cs
+++ b/PocketSharp/Components/Add.cs
@@ -1,6 +1,5 @@
 using PocketSharp.Models;
 using System;
-using System.Collections.Generic;
 
 namespace PocketSharp
 {
diff --git a/PocketSharp/Components/Authentification.cs b/PocketSharp/Components/Authentification.cs
index bc5e47a..f9308cf 100644
--- a/PocketSharp/Components/Authentification.cs
+++ b/PocketSharp/Components/Authentification.cs
@@ -1,8 +1,6 @@
 using PocketSharp.Models.Authentification;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using RestSharp;
 
 namespace PocketSharp
diff --git a/PocketSharp/Components/Modify.cs b/PocketSharp/Components/Modify.cs
index 926a289..3d9502b 100644
--- a/PocketSharp/Components/Modify.cs
+++ b/PocketSharp/Components/Modify.cs
@@ -1,5 +1,4 @@
 using PocketSharp.Models;
-using System.Collections.Generic;
 
 namespace PocketSharp
 {
diff --git a/PocketSharp/Components/ModifyTags.cs b/PocketSharp/Components/ModifyTags.cs
index 252e2f1..a9dcc65 100644
--- a/PocketSharp/Components/ModifyTags.cs
+++ b/PocketSharp/Components/ModifyTags.cs
@@ -1,5 +1,4 @@
 using PocketSharp.Models;
-using System.Collections.Generic;
 
 namespace PocketSharp
 {
diff --git a/PocketSharp/JsonDeserializer.cs b/PocketSharp/JsonDeserializer.cs
index 55f5589..9bb5435 100644
--- a/PocketSharp/JsonDeserializer.cs
+++ b/PocketSharp/JsonDeserializer.cs
@@ -2,7 +2,6 @@
 using RestSharp.Deserializers;
 using ServiceStack.Text;
 using System;
-using System.Collections.Generic;
 
 namespace PocketSharp
 {
diff --git a/PocketSharp/Models/Authentification/AccessCode.cs b/PocketSharp/Models/Authentification/AccessCode.cs
index e8bef95..c574518 100644
--- a/PocketSharp/Models/Authentification/AccessCode.cs
+++ b/PocketSharp/Models/Authentification/AccessCode.cs
@@ -1,6 +1,4 @@
-using RestSharp.Serializers;
-using System.Collections.Generic;
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 
 namespace PocketSharp.Models.Authentification
 {
diff --git a/PocketSharp/Models/Authentification/RequestCode.cs b/PocketSharp/Models/Authentification/RequestCode.cs
index 99f9fda..cad4000 100644
--- a/PocketSharp/Models/Authentification/RequestCode.cs
+++ b/PocketSharp/Models/Authentification/RequestCode.cs
@@ -1,6 +1,4 @@
-using RestSharp.Serializers;
-using System.Collections.Generic;
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 
 namespace PocketSharp.Models.Authentification
 {
diff --git a/PocketSharp/Models/Parameters/ActionParameter.cs b/PocketSharp/Models/Parameters/ActionParameter.cs
index 93fd110..6a1b70d 100644
--- a/PocketSharp/Models/Parameters/ActionParameter.cs
+++ b/PocketSharp/Models/Parameters/ActionParameter.cs
@@ -1,8 +1,5 @@
-using RestSharp;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Reflection;
-using System.Runtime.Serialization;
 
 namespace PocketSharp.Models
 {
diff --git a/PocketSharp/Models/Parameters/AddParameters.cs b/PocketSharp/Models/Parameters/AddParameters.cs
index 5efc4e9..46b0e86 100644
--- a/PocketSharp/Models/Parameters/AddParameters.cs
+++ b/PocketSharp/Models/Parameters/AddParameters.cs
@@ -1,8 +1,6 @@
 using RestSharp;
 using System;
 using System.Collections.Generic;
-using System.Reflection;
-using System.Runtime.Serialization;
 
 namespace PocketSharp.Models
 {
diff --git a/PocketSharp/Models/Parameters/ModifyParameters.cs b/PocketSharp/Models/Parameters/ModifyParameters.cs
index eb4fff8..3e7e24f 100644
--- a/PocketSharp/Models/Parameters/ModifyParameters.cs
+++ b/PocketSharp/Models/Parameters/ModifyParameters.cs
@@ -1,6 +1,5 @@
 using RestSharp;
 using ServiceStack.Text;
-using System;
 using System.Collections.Generic;
 
 namespace PocketSharp.Models
diff --git a/PocketSharp/Models/Parameters/ParameterBase.cs b/PocketSharp/Models/Parameters/ParameterBase.cs
deleted file mode 100644
index 14653e1..0000000
--- a/PocketSharp/Models/Parameters/ParameterBase.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using RestSharp;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace PocketSharp.Models
-{
-  public abstract class ParameterBase
-  {
-    protected static Parameter CreateParam(string name, object value, ParameterType type = ParameterType.GetOrPost)
-    {
-      return new Parameter()
-      {
-        Name = name,
-        Value = value,
-        Type = type
-      };
-    }
-  }
-}
diff --git a/PocketSharp/Models/Parameters/RetrieveParameters.cs b/PocketSharp/Models/Parameters/RetrieveParameters.cs
index a459261..3bdfe61 100644
--- a/PocketSharp/Models/Parameters/RetrieveParameters.cs
+++ b/PocketSharp/Models/Parameters/RetrieveParameters.cs
@@ -1,9 +1,6 @@
 using RestSharp;
 using System;
 using System.Collections.Generic;
-using System.Reflection;
-using System.Runtime.Serialization;
-using ServiceStack.Text;
 
 namespace PocketSharp.Models
 {
diff --git a/PocketSharp/Models/Response/Add.cs b/PocketSharp/Models/Response/Add.cs
index a3c2c8e..43ea3d0 100644
--- a/PocketSharp/Models/Response/Add.cs
+++ b/PocketSharp/Models/Response/Add.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 
 namespace PocketSharp.Models
 {
diff --git a/PocketSharp/Models/Response/Modify.cs b/PocketSharp/Models/Response/Modify.cs
index 86c699c..5388724 100644
--- a/PocketSharp/Models/Response/Modify.cs
+++ b/PocketSharp/Models/Response/Modify.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 
 namespace PocketSharp.Models
 {
diff --git a/PocketSharp/Models/Response/ResponseBase.cs b/PocketSharp/Models/Response/ResponseBase.cs
index d9f93b6..f635a73 100644
--- a/PocketSharp/Models/Response/ResponseBase.cs
+++ b/PocketSharp/Models/Response/ResponseBase.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
+using System.Runtime.Serialization;
 
 namespace PocketSharp.Models
 {
diff --git a/PocketSharp/Models/Response/Retrieve.cs b/PocketSharp/Models/Response/Retrieve.cs
index f686ed1..5628b40 100644
--- a/PocketSharp/Models/Response/Retrieve.cs
+++ b/PocketSharp/Models/Response/Retrieve.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Runtime.Serialization;
 
 namespace PocketSharp.Models
diff --git a/PocketSharp/PocketClient.cs b/PocketSharp/PocketClient.cs
index b46148b..d247d7d 100644
--- a/PocketSharp/PocketClient.cs
+++ b/PocketSharp/PocketClient.cs
@@ -3,7 +3,6 @@ using RestSharp;
 using System;
 using System.Collections.Generic;
 using System.Net;
-using ServiceStack.Text;
 
 namespace PocketSharp
 {
diff --git a/PocketSharp/Utilities.cs b/PocketSharp/Utilities.cs
index 9736e0e..a7174a3 100644
--- a/PocketSharp/Utilities.cs
+++ b/PocketSharp/Utilities.cs
@@ -1,8 +1,6 @@
 using RestSharp;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace PocketSharp
 {