diff --git a/Templates/Full/game/scripts/server/components/game/camera.cs b/Templates/Full/game/scripts/server/components/game/camera.cs
index e0b6bc41e..24363bd82 100644
--- a/Templates/Full/game/scripts/server/components/game/camera.cs
+++ b/Templates/Full/game/scripts/server/components/game/camera.cs
@@ -22,8 +22,6 @@
 
 function CameraComponent::onAdd(%this) 
 {
-   Parent::onBehaviorAdd(%this);
-
    %this.addComponentField(clientOwner, "The client that views this camera", "int", "1", "");
 
    %test = %this.clientOwner;
diff --git a/Templates/Full/game/scripts/server/components/game/controlObject.cs b/Templates/Full/game/scripts/server/components/game/controlObject.cs
index 5b67f394b..7f477ecca 100644
--- a/Templates/Full/game/scripts/server/components/game/controlObject.cs
+++ b/Templates/Full/game/scripts/server/components/game/controlObject.cs
@@ -24,8 +24,6 @@
 
 function ControlObjectComponent::onAdd(%this)
 {
-   Parent::onBehaviorAdd(%this);
-
    %this.addComponentField(clientOwner, "The shape to use for rendering", "int", "1", "");
 
    %clientID = %this.getClientID();
diff --git a/Templates/Full/game/scripts/server/components/input/fpsControls.cs b/Templates/Full/game/scripts/server/components/input/fpsControls.cs
index 3e7f571bd..8331e409d 100644
--- a/Templates/Full/game/scripts/server/components/input/fpsControls.cs
+++ b/Templates/Full/game/scripts/server/components/input/fpsControls.cs
@@ -24,8 +24,6 @@
 
 function FPSControls::onAdd(%this)
 {
-   Parent::onBehaviorAdd(%this);
-
    //
 	%this.beginGroup("Keys");
 		%this.addComponentField(forwardKey, "Key to bind to vertical thrust", keybind, "keyboard w");
diff --git a/Templates/Full/game/scripts/server/gameObjects/GameObjectList.xml b/Templates/Full/game/scripts/server/gameObjects/GameObjectList.xml
deleted file mode 100644
index e9cc73c89..000000000
--- a/Templates/Full/game/scripts/server/gameObjects/GameObjectList.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<GameObjects>
-    <GameObject>
-        <Name>ScriptedTriggerObject</Name>
-        <TAMLPath>data/EC/scripts/gameObjects/ScriptedTriggerObject.taml</TAMLPath>
-        <ScriptPath>data/EC/scripts/gameObjects/ScriptedTriggerObject.cs</ScriptPath>
-    </GameObject>
-    <GameObject>
-        <Name>PlayerObject</Name>
-        <TAMLPath>data/EC/scripts/gameObjects/playerObject.taml</TAMLPath>
-        <ScriptPath>data/EC/scripts/gameObjects/playerObject.cs</ScriptPath>
-    </GameObject>
-    <GameObject>
-        <Name>spectatorObject</Name>
-        <TAMLPath>data/EC/scripts/gameObjects/spectatorObject.taml</TAMLPath>
-        <ScriptPath>data/EC/scripts/gameObjects/spectatorObject.cs</ScriptPath>
-    </GameObject>
-    <GameObject>
-        <Name>ThirdPersonPlayerObject</Name>
-        <TAMLPath>data/EC/scripts/gameObjects/ThirdPersonPlayerObject.taml</TAMLPath>
-        <ScriptPath>data/EC/scripts/gameObjects/ThirdPersonPlayerObject.cs</ScriptPath>
-    </GameObject>
-    <GameObject>
-        <Name>FirstPersonArms</Name>
-        <TAMLPath>data/EC/scripts/gameObjects/FirstPersonArms.taml</TAMLPath>
-        <ScriptPath>data/EC/scripts/gameObjects/FirstPersonArms.cs</ScriptPath>
-    </GameObject>
-</GameObjects>
diff --git a/Templates/Full/game/scripts/server/gameObjects/ThirdPersonPlayerObject.cs b/Templates/Full/game/scripts/server/gameObjects/ThirdPersonPlayerObject.cs
index bc92db12d..3ab05a79d 100644
--- a/Templates/Full/game/scripts/server/gameObjects/ThirdPersonPlayerObject.cs
+++ b/Templates/Full/game/scripts/server/gameObjects/ThirdPersonPlayerObject.cs
@@ -26,12 +26,6 @@ function ThirdPersonPlayerObject::onAdd(%this)
    
    %this.aimedMaxPitch = 90;
    %this.aimedMinPitch = -90;
-   
-   %this.arms = SGOManager.spawn("FirstPersonArms", true);
-   
-   %this.add(arms);
-   
-   //%this.mesh.mountObject(%this.arms, "Eye");
 }
 
 function ThirdPersonPlayerObject::onRemove(%this)