diff --git a/src/droid.c b/src/droid.c
index b6238f080..08a91b25d 100644
--- a/src/droid.c
+++ b/src/droid.c
@@ -5513,15 +5513,6 @@ DROID * giftSingleDroid(DROID *psD, UDWORD to)
 
 	CHECK_DROID(psD);
 
-    //leave any group it belongs to  - this gets called in droidRemove()
-	/*if(psD->psGroup)
-	{
-		grpLeave( psD->psGroup, psD);
-		psD->psGroup = NULL;
-	}*/
-	// remove the droid from the cluster systerm - this gets called in droidRemove()
-	//clustRemoveObject((BASE_OBJECT *)psD);
-
 	if(psD->player == to)
 	{
 		return psD;
diff --git a/src/mission.c b/src/mission.c
index 5e1583682..9d17f1928 100644
--- a/src/mission.c
+++ b/src/mission.c
@@ -2215,24 +2215,6 @@ void aiUpdateMissionStructure(STRUCTURE *psStructure)
 						intRefreshScreen();	// update the interface.
 					}
 
-                    //store the factory as the droid's baseStructure instead
-					//add it to the factory group
-					/*if (!psFactory->psGroup)
-					{
-						//create the factory group
-						if (!grpCreate(&psFactory->psGroup))
-						{
-							DBPRINTF(("missionUpdateStructure: unable to create group\n"));
-						}
-						else
-						{
-							grpJoin(psFactory->psGroup, psNewDroid);
-						}
-					}
-					else
-					{
-						grpJoin(psFactory->psGroup, psNewDroid);
-					}*/
 					setDroidBase(psNewDroid, psStructure);
 
 					//reset the start time