diff --git a/source/libpb/deserialization.d b/source/libpb/deserialization.d
index 7a84399..54b9d59 100644
--- a/source/libpb/deserialization.d
+++ b/source/libpb/deserialization.d
@@ -1,14 +1,12 @@
 module libpb.deserialization;
 
 import std.json;
+import std.traits : FieldTypeTuple, FieldNameTuple;
 
 public RecordType fromJSON(RecordType)(JSONValue jsonIn)
 {
 	RecordType record;
 
-	import std.traits;
-	import std.meta : AliasSeq;
-
 	// Alias as to only expand later when used in compile-time
 	alias structTypes = FieldTypeTuple!(RecordType);
 	alias structNames = FieldNameTuple!(RecordType);
diff --git a/source/libpb/serialization.d b/source/libpb/serialization.d
index f3fd264..05b735b 100644
--- a/source/libpb/serialization.d
+++ b/source/libpb/serialization.d
@@ -2,21 +2,13 @@ module libpb.serialization;
 
 import std.json;
 import std.conv : to;
-
-debug(dbg)
-{
-	import std.stdio : writeln;
-}
+import std.traits : FieldTypeTuple, FieldNameTuple;
 
 public JSONValue serializeRecord(RecordType)(RecordType record)
-{
-	import std.traits;
-	import std.meta : AliasSeq;
-		
+{		
 	// Final JSON to submit
 	JSONValue builtJSON;
 
-
 	// Alias as to only expand later when used in compile-time
 	alias structTypes = FieldTypeTuple!(RecordType);
 	alias structNames = FieldNameTuple!(RecordType);
@@ -84,6 +76,7 @@ unittest
 {
 	import std.algorithm.searching : canFind;
 	import std.string : cmp;
+	import std.stdio : writeln;
 	
 	struct Person
 	{