diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml b/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml
index 238158bbf..7faaf1fcf 100644
--- a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml
+++ b/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml
@@ -688,8 +688,6 @@
 		<DYNAMIC_CHILD CLASS_NAME="recv_named_item"/>
 		<DYNAMIC_CHILD CLASS_NAME="recv_xp"/>
 		<DYNAMIC_CHILD CLASS_NAME="destroy_item"/>
-		<DYNAMIC_CHILD CLASS_NAME="give_control" />
-		<DYNAMIC_CHILD CLASS_NAME="recv_charge_point" />
 	</PRIMITIVE>
 
 	
@@ -838,14 +836,6 @@
 		<PARAMETER NAME="faction" TYPE="string" VISIBLE="true"/>
 		<PARAMETER NAME="point" TYPE="string" VISIBLE="true"/>
 	</PRIMITIVE>
-	
-	<PRIMITIVE CLASS_NAME="give_control" TYPE="node" AUTO_INIT="false" DELETABLE="true" NUMBERIZE="false">
-		<PARAMETER NAME="outpost_name" TYPE="string" VISIBLE="true" />
-	</PRIMITIVE>
-	
-	<PRIMITIVE CLASS_NAME="recv_charge_point" TYPE="node" AUTO_INIT="false" DELETABLE="true" NUMBERIZE="false">
-		<PARAMETER NAME="charge_points" TYPE="string" VISIBLE="true" />
-	</PRIMITIVE>
 
 	<PRIMITIVE CLASS_NAME="recv_fame" TYPE="node" AUTO_INIT="false" DELETABLE="true" NUMBERIZE="false">
 		<PARAMETER NAME="name" TYPE="string" VISIBLE="true" AUTONAME="recv_fame $value$ $fame_owner$"/>
@@ -1108,8 +1098,6 @@
 		<DYNAMIC_CHILD CLASS_NAME="recv_named_item"/>
 		<DYNAMIC_CHILD CLASS_NAME="recv_xp"/>
 		<DYNAMIC_CHILD CLASS_NAME="destroy_item"/>
-		<DYNAMIC_CHILD CLASS_NAME="give_control" />
-		<DYNAMIC_CHILD CLASS_NAME="recv_charge_point" />
 	</PRIMITIVE>
 
 	<PRIMITIVE CLASS_NAME="kill" TYPE="node" PARENT_CLASS="objective_parent">
@@ -1122,10 +1110,6 @@
 		<PARAMETER NAME="npc_by_name/quantity" TYPE="string" VISIBLE="true"/>
 		<PARAMETER NAME="faction/quantity" TYPE="string" VISIBLE="true"/>
 		<PARAMETER NAME="place" TYPE="string" VISIBLE="true"/>
-	
-		<PARAMETER NAME="nb_guild_members_needed" TYPE="string" VISIBLE="true">
-			<DEFAULT_VALUE VALUE="1" />
-		</PARAMETER>
 	</PRIMITIVE>
 	
 	<PRIMITIVE CLASS_NAME="talk_to" TYPE="node"  PARENT_CLASS="objective_parent">
@@ -1135,45 +1119,28 @@
 			<DEFAULT_VALUE VALUE="$giver$"/>
 		</PARAMETER>
 		<PARAMETER NAME="phrase" TYPE="string_array" VISIBLE="true" FILE_EXTENSION="txt"/>
-		<PARAMETER NAME="nb_guild_members_needed" TYPE="string" VISIBLE="true">
-			<DEFAULT_VALUE VALUE="1" />
-		</PARAMETER>
 	</PRIMITIVE>
 
 	<PRIMITIVE CLASS_NAME="cast" TYPE="node" PARENT_CLASS="objective_parent">
 		<PARAMETER NAME="name" TYPE="string" VISIBLE="true" AUTONAME="cast $spell$"/>
 						
 		<PARAMETER NAME="action" TYPE="string_array" VISIBLE="true"/>
-		<PARAMETER NAME="place" TYPE="string" VISIBLE="true"/>
-		
-		<PARAMETER NAME="nb_guild_members_needed" TYPE="string" VISIBLE="true">
-			<DEFAULT_VALUE VALUE="1" />
-		</PARAMETER>
-		
+		<PARAMETER NAME="place" TYPE="string" VISIBLE="true"/>		
 	</PRIMITIVE>
 	
 	<PRIMITIVE CLASS_NAME="forage" TYPE="node" PARENT_CLASS="objective_parent">
 		<PARAMETER NAME="name" TYPE="string" VISIBLE="true" AUTONAME="forage"/>
 		<PARAMETER NAME="item/quantity/quality" TYPE="string_array" VISIBLE="true"/>
-		<PARAMETER NAME="nb_guild_members_needed" TYPE="string" VISIBLE="true">
-			<DEFAULT_VALUE VALUE="1" />
-		</PARAMETER>
 	</PRIMITIVE>
 
 	<PRIMITIVE CLASS_NAME="loot" TYPE="node" PARENT_CLASS="objective_parent">
 		<PARAMETER NAME="name" TYPE="string" VISIBLE="true" AUTONAME="loot"/>
 		<PARAMETER NAME="item/quantity/quality" TYPE="string_array" VISIBLE="true"/>
-		<PARAMETER NAME="nb_guild_members_needed" TYPE="string" VISIBLE="true">
-			<DEFAULT_VALUE VALUE="1" />
-		</PARAMETER>
 	</PRIMITIVE>
 
 	<PRIMITIVE CLASS_NAME="craft" TYPE="node" PARENT_CLASS="objective_parent">
 		<PARAMETER NAME="name" TYPE="string" VISIBLE="true" AUTONAME="craft"/>
 		<PARAMETER NAME="item/quantity/quality" TYPE="string_array" VISIBLE="true"/>
-		<PARAMETER NAME="nb_guild_members_needed" TYPE="string" VISIBLE="true">
-			<DEFAULT_VALUE VALUE="1" />
-		</PARAMETER>
 	</PRIMITIVE>
 
 	<PRIMITIVE CLASS_NAME="target" TYPE="node" PARENT_CLASS="objective_parent">
@@ -1182,27 +1149,18 @@
 		<PARAMETER NAME="races_to_target" TYPE="string_array" VISIBLE="true"/>
 		<PARAMETER NAME="faunas_to_target" TYPE="string_array" VISIBLE="true"/>
 		<PARAMETER NAME="place" TYPE="string" VISIBLE="true"/>
-		<PARAMETER NAME="nb_guild_members_needed" TYPE="string" VISIBLE="true">
-			<DEFAULT_VALUE VALUE="1" />
-		</PARAMETER>
 	</PRIMITIVE>
 
 	<PRIMITIVE CLASS_NAME="sell" TYPE="node" PARENT_CLASS="objective_parent">
 		<PARAMETER NAME="name" TYPE="string" VISIBLE="true" AUTONAME="sell"/>
 		<PARAMETER NAME="item/quantity/quality" TYPE="string_array" VISIBLE="true"/>
 		<PARAMETER NAME="npc_name" TYPE="string" VISIBLE="true"/>
-		<PARAMETER NAME="nb_guild_members_needed" TYPE="string" VISIBLE="true">
-			<DEFAULT_VALUE VALUE="1" />
-		</PARAMETER>
 	</PRIMITIVE>
 
 	<PRIMITIVE CLASS_NAME="buy" TYPE="node" PARENT_CLASS="objective_parent">
 		<PARAMETER NAME="name" TYPE="string" VISIBLE="true" AUTONAME="buy"/>
 		<PARAMETER NAME="item/quantity/quality" TYPE="string_array" VISIBLE="true"/>
 		<PARAMETER NAME="npc_name" TYPE="string" VISIBLE="true"/>
-		<PARAMETER NAME="nb_guild_members_needed" TYPE="string" VISIBLE="true">
-			<DEFAULT_VALUE VALUE="1" />
-		</PARAMETER>
 	</PRIMITIVE>
 
 	<PRIMITIVE CLASS_NAME="give_item" TYPE="node" PARENT_CLASS="objective_parent">
@@ -1212,9 +1170,6 @@
 		<PARAMETER NAME="npc_name" TYPE="string" VISIBLE="true">
 			<DEFAULT_VALUE VALUE="$giver$"/>
 		</PARAMETER>
-		<PARAMETER NAME="nb_guild_members_needed" TYPE="string" VISIBLE="true">
-			<DEFAULT_VALUE VALUE="1" />
-		</PARAMETER>
 	</PRIMITIVE>
 
 	<PRIMITIVE CLASS_NAME="give_money" TYPE="node" PARENT_CLASS="objective_parent">
@@ -1223,9 +1178,6 @@
 		<PARAMETER NAME="npc_name" TYPE="string" VISIBLE="true">
 			<DEFAULT_VALUE VALUE="$giver$"/>
 		</PARAMETER>
-		<PARAMETER NAME="nb_guild_members_needed" TYPE="string" VISIBLE="true">
-			<DEFAULT_VALUE VALUE="1" />
-		</PARAMETER>
 	</PRIMITIVE>
 
 	<PRIMITIVE CLASS_NAME="visit" TYPE="node" PARENT_CLASS="objective_parent">
@@ -1233,9 +1185,6 @@
 						
 		<PARAMETER NAME="place" TYPE="string" VISIBLE="true"/>
 		<PARAMETER NAME="items_worn" TYPE="string_array" VISIBLE="true"/>
-		<PARAMETER NAME="nb_guild_members_needed" TYPE="string" VISIBLE="true">
-			<DEFAULT_VALUE VALUE="1" />
-		</PARAMETER>
 	</PRIMITIVE>
 
 	<PRIMITIVE CLASS_NAME="escort" TYPE="node" PARENT_CLASS="objective_parent">
@@ -1243,35 +1192,23 @@
 						
 		<PARAMETER NAME="group_to_escort" TYPE="string" VISIBLE="true"/>
 		<PARAMETER NAME="save_all" TYPE="boolean" VISIBLE="true"/>
-		<PARAMETER NAME="nb_guild_members_needed" TYPE="string" VISIBLE="true">
-			<DEFAULT_VALUE VALUE="1" />
-		</PARAMETER>
 	</PRIMITIVE>
 
 	<PRIMITIVE CLASS_NAME="skill" TYPE="node" PARENT_CLASS="objective_parent">
 		<PARAMETER NAME="name" TYPE="string" VISIBLE="true" AUTONAME="skill $skill_name$ $level$"/>
 		<PARAMETER NAME="skill_name/level" TYPE="string_array" VISIBLE="true"/>
-		<PARAMETER NAME="nb_guild_members_needed" TYPE="string" VISIBLE="true">
-			<DEFAULT_VALUE VALUE="1" />
-		</PARAMETER>
 	</PRIMITIVE>
 
 	<PRIMITIVE CLASS_NAME="do_mission" TYPE="node" PARENT_CLASS="objective_parent">
 		<PARAMETER NAME="name" TYPE="string" VISIBLE="true" AUTONAME="do_mission"/>
 						
 		<PARAMETER NAME="mission_names" TYPE="string_array" VISIBLE="true"/>
-		<PARAMETER NAME="nb_guild_members_needed" TYPE="string" VISIBLE="true">
-			<DEFAULT_VALUE VALUE="1" />
-		</PARAMETER>
 	</PRIMITIVE>
 
 	<PRIMITIVE CLASS_NAME="wait_ai_msg" TYPE="node" PARENT_CLASS="objective_parent">
 		<PARAMETER NAME="name" TYPE="string" VISIBLE="true" AUTONAME="wait_ai_msg $msg_content$"/>
 						
 		<PARAMETER NAME="msg_content" TYPE="string_array" VISIBLE="true"/>
-		<PARAMETER NAME="nb_guild_members_needed" TYPE="string" VISIBLE="true">
-			<DEFAULT_VALUE VALUE="1" />
-		</PARAMETER>
 	</PRIMITIVE>
 
 	<PRIMITIVE CLASS_NAME="queue_start" TYPE="node" PARENT_CLASS="objective_parent">
@@ -1304,18 +1241,12 @@
 				<CONTEXT_VALUE VALUE="zorai_newbie"/>
 			</COMBO_VALUES>
 		</PARAMETER>
-		<!--<PARAMETER NAME="nb_guild_members_needed" TYPE="string" VISIBLE="true">
-			<DEFAULT_VALUE VALUE="1" />
-		</PARAMETER>-->
 	</PRIMITIVE>
 
 	<PRIMITIVE CLASS_NAME="ring_scenario" TYPE="node" PARENT_CLASS="objective_parent">
 		<PARAMETER NAME="name" TYPE="string" VISIBLE="true" AUTONAME="ring_scenario"/>
 						
 		<PARAMETER NAME="scenario_tag" TYPE="string" VISIBLE="true"/>
-		<PARAMETER NAME="nb_guild_members_needed" TYPE="string" VISIBLE="true">
-			<DEFAULT_VALUE VALUE="1" />
-		</PARAMETER>
 	</PRIMITIVE>