diff --git a/model/KeyAction.ts b/model/KeyAction.ts
index 229eb16b..4f200fee 100644
--- a/model/KeyAction.ts
+++ b/model/KeyAction.ts
@@ -1,16 +1,13 @@
-/// <reference path="KeyActionNone.ts" />
-/// <reference path="KeystrokeAction.ts" />
-
 class KeyAction {
 
     static fromJsObject(jsObject: any): KeyAction {
         switch (jsObject.keyActionType) {
-            case KeystrokeAction.actionTypeString:
-                return new KeyActionNone().fromJsObject(jsObject);
             case KeystrokeAction.actionTypeString:
                 return new KeystrokeAction().fromJsObject(jsObject);
+            case KeyActionNone.actionTypeString:
+                return new KeyActionNone().fromJsObject(jsObject);
             default:
-                throw 'Unknown KeyAction actionType "${jsObject.actionType}"';
+                throw 'Invalid KeyAction.keyActionType: "${jsObject.actionType}"';
         }
     }
 
@@ -23,7 +20,7 @@ class KeyAction {
         } else if (keyActionFirstByte === KeyActionNone.keyActionNoneId) {
             return new KeyActionNone().fromBinary(buffer);
         } else {
-            throw 'Unknown KeyAction first byte "${keyActionFirstByte}"';
+            throw 'Invalid KeyAction first byte "${keyActionFirstByte}"';
         }
     }
 }
diff --git a/model/KeyActionNone.ts b/model/KeyActionNone.ts
index fd57cf78..3ee0871e 100644
--- a/model/KeyActionNone.ts
+++ b/model/KeyActionNone.ts
@@ -1,6 +1,3 @@
-/// <reference path="KeyAction.ts" />
-/// <reference path="Serializable.ts" />
-
 class KeyActionNone extends KeyAction implements Serializable<KeyActionNone> {
 
     static actionTypeString = 'none';
diff --git a/model/KeystrokeAction.ts b/model/KeystrokeAction.ts
index 8a8d24ae..2ac7cde1 100644
--- a/model/KeystrokeAction.ts
+++ b/model/KeystrokeAction.ts
@@ -1,6 +1,3 @@
-/// <reference path="KeyAction.ts" />
-/// <reference path="Serializable.ts" />
-
 class KeystrokeAction extends KeyAction implements Serializable<KeystrokeAction> {
 
     static actionTypeString = 'keystroke';
diff --git a/model/Serializable.ts b/model/Serializable.ts
index 59c77891..5949e77e 100644
--- a/model/Serializable.ts
+++ b/model/Serializable.ts
@@ -1,5 +1,3 @@
-/// <reference path="UhkBuffer.ts" />
-
 interface Serializable<T> {
     fromJsObject(jsObject: any): T;
     fromBinary(buffer: UhkBuffer): T;
diff --git a/model/serializeConfig.ts b/model/serializeConfig.ts
index 0a55aa6e..9c621bf6 100644
--- a/model/serializeConfig.ts
+++ b/model/serializeConfig.ts
@@ -1,5 +1,8 @@
+/// <reference path="Serializable.ts" />
 /// <reference path="UhkBuffer.ts" />
+/// <reference path="KeyAction.ts" />
 /// <reference path="KeystrokeAction.ts" />
+/// <reference path="KeyActionNone.ts" />
 
 let fs = require('fs');
 let writer = new UhkBuffer();
@@ -147,6 +150,5 @@ function serializeSwitchLayerAction(switchLayerAction) {
     }[switchLayerAction] | switchLayerAction.toggle ? SWITCH_LAYER_TOGGLE : 0);
 }
 
-new KeystrokeAction();
-serializeKeyActions(keyActions);
+//serializeKeyActions(keyActions);
 fs.writeFileSync('uhk-config.bin', writer.buffer);