diff --git a/options.cfg b/options.cfg
index 9a9489b6..5a3a7f8e 100644
--- a/options.cfg
+++ b/options.cfg
@@ -1,3 +1,3 @@
-LOAD.SNAPSHOT_OBJECTS=0
-LOAD.BUILDOUT_OBJECTS=0
-LOAD.RESOURCE.SYSTEM=0
\ No newline at end of file
+LOAD.SNAPSHOT_OBJECTS=1
+LOAD.BUILDOUT_OBJECTS=1
+LOAD.RESOURCE.SYSTEM=1
\ No newline at end of file
diff --git a/scripts/object/mobile/dressed_stormtrooper_m.py b/scripts/object/mobile/dressed_stormtrooper_m.py
index 961975a9..a4b0d784 100644
--- a/scripts/object/mobile/dressed_stormtrooper_m.py
+++ b/scripts/object/mobile/dressed_stormtrooper_m.py
@@ -11,10 +11,5 @@ def setup(core, object):
 	lootPoolChances_2 = [100]
 	lootGroupChance_2 = 20
 	object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2)
-	
-	lootPoolNames_3 = ['Rareloot']
-	lootPoolChances_3 = [100]
-	lootGroupChance_3 = 1
-	object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3)
 
 	return 
\ No newline at end of file
diff --git a/scripts/object/mobile/tusken_raider.py b/scripts/object/mobile/tusken_raider.py
index 961975a9..97f7842a 100644
--- a/scripts/object/mobile/tusken_raider.py
+++ b/scripts/object/mobile/tusken_raider.py
@@ -12,9 +12,4 @@ def setup(core, object):
 	lootGroupChance_2 = 20
 	object.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2)
 	
-	lootPoolNames_3 = ['Rareloot']
-	lootPoolChances_3 = [100]
-	lootGroupChance_3 = 1
-	object.addToLootGroups(lootPoolNames_3,lootPoolChances_3,lootGroupChance_3)
-
 	return 
\ No newline at end of file
diff --git a/src/resources/objects/tangible/TangibleObject.java b/src/resources/objects/tangible/TangibleObject.java
index eccd631f..3ac40cf1 100644
--- a/src/resources/objects/tangible/TangibleObject.java
+++ b/src/resources/objects/tangible/TangibleObject.java
@@ -23,17 +23,12 @@ package resources.objects.tangible;
 
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeMap;
-import java.util.TreeSet;
 import java.util.Vector;
 
 import javax.xml.bind.DatatypeConverter;
diff --git a/src/services/DevService.java b/src/services/DevService.java
index f6b387be..ef265f41 100644
--- a/src/services/DevService.java
+++ b/src/services/DevService.java
@@ -67,7 +67,7 @@ public class DevService implements INetworkDispatch {
 	public void sendCharacterBuilderSUI(CreatureObject creature, int childMenu) 
 	{
 		Map<Long, String> suiOptions = new HashMap<Long, String>();
-		
+
 		switch(childMenu)
 		{
 			case 0: // Root
@@ -85,9 +85,7 @@ public class DevService implements INetworkDispatch {
 				suiOptions.put((long) 22, "Misc Items");
 				suiOptions.put((long) 23, "Jedi Items");
 				suiOptions.put((long) 110, "Survey Devices");
-				//suiOptions.put((long) 120, "House Deeds");
-				suiOptions.put((long) 111, "Spawn Tusken");
-				suiOptions.put((long) 112, "Spawn Krayt");
+				if(creature.getClient().isGM()) suiOptions.put((long) 120, "House Deeds");
 				break;
 			case 3: // [Items] Weapons
 				suiOptions.put((long) 30, "Jedi Weapons");
@@ -995,29 +993,6 @@ public class DevService implements INetworkDispatch {
 						inventory.add(solarSurveyTool);
 						return;
 						
-					case 111:
-						
-						
-						CreatureObject spawned2 = core.spawnService.spawnCreature("object/mobile/shared_tusken_raider.iff", "tatooine", 0, player.getPosition().x, player.getPosition().y, player.getPosition().z, 1, 0, 1, 0, 5);
-						// core.spawnService.spawnCreature(arg1, actor.getPlanet().getName(), 0, pos.x, pos.y, pos.z, 1, 0, 1, 0, int(arg2))
-						//SWGObject spawned = core.staticService.spawnObject("object/mobile/shared_tusken_raider.iff", "tatooine", 0L, 3522F, 4F, -4801F, 0.70F, 0.71F);
-						//CreatureObject spawned2 = (CreatureObject) spawned;
-//						spawned2.setLevel((short)5);
-//						spawned2.setCombatFlag((byte)1);
-//						spawned2.setStateBitmask(1);
-//						spawned2.setOptionsBitmask(128);
-						
-						//core.lootService.handleLootRequest(player,(TangibleObject)spawned2);
-						break;
-					case 112:
-						SWGObject spawned3 = core.staticService.spawnObject("object/mobile/shared_krayt_dragon.iff", "tatooine", 0L, 3512F, 4F, -4801F, 0.70F, 0.71F);
-						
-//						pos = actor.getWorldPosition()
-//								core.spawnService.spawnCreature(arg1, actor.getPlanet().getName(), 0, pos.x, pos.y, pos.z, 1, 0, 1, 0, int(arg2))
-//						
-						core.lootService.handleLootRequest(player,(TangibleObject)spawned3);
-						break;
-						
 					case 120:
 						SWGObject houseDeed = core.objectService.createObject("object/tangible/deed/player_house_deed/shared_generic_house_small_deed.iff", planet);
 						inventory.add(houseDeed);
diff --git a/src/services/ai/states/DeathState.java b/src/services/ai/states/DeathState.java
index 13abdec0..14df1485 100644
--- a/src/services/ai/states/DeathState.java
+++ b/src/services/ai/states/DeathState.java
@@ -29,6 +29,7 @@ public class DeathState extends AIState {
 	@Override
 	public byte onEnter(AIActor actor) {
 		NGECore.getInstance().aiService.awardExperience(actor);
+		actor.getCreature().setAttachment("radial_filename", "npc/corpse");
 		actor.scheduleDespawn();
 		return 0;
 	}
diff --git a/src/services/spawn/SpawnService.java b/src/services/spawn/SpawnService.java
index a9ef4522..915c0498 100644
--- a/src/services/spawn/SpawnService.java
+++ b/src/services/spawn/SpawnService.java
@@ -167,7 +167,7 @@ public class SpawnService {
 		creature.setAttachment("AI", actor);
 		actor.setMobileTemplate(mobileTemplate);
 		
-		creature.setAttachment("radial_filename", "npc/corpse");
+		//creature.setAttachment("radial_filename", "npc/corpse");
 	
 		
 		if(cell == null) {