diff --git a/code/ryzom/server/src/entities_game_service/database_plr.cpp b/code/ryzom/server/src/entities_game_service/database_plr.cpp
index 249897755..993b7c05f 100644
--- a/code/ryzom/server/src/entities_game_service/database_plr.cpp
+++ b/code/ryzom/server/src/entities_game_service/database_plr.cpp
@@ -3140,10 +3140,6 @@ void CBankAccessor_PLR::TPACK_ANIMAL::TBEAST::init(ICDBStructNode *parent, uint
 	nlassert(node != NULL);
 	_DESPAWN = node;
 	
-	node  = parent->getNode( ICDBStructNode::CTextId("NAME"), false );
-	nlassert(node != NULL);
-	_NAME = node;
-
 	// WARNING: let the value to true, else it'll corrupt backups
 	node  = parent->getNode( ICDBStructNode::CTextId("NAME"), true );
 	nlassert(node != NULL);
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp
index 0d5741334..c25e63433 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp
@@ -829,13 +829,6 @@ void CCharacter::moveItem(INVENTORIES::TInventory srcInvId, uint32 srcSlot, INVE
 		return;
 	}
 
-	// You cannot exchange genesis named items
-	if (srcItem->getPhraseId().find("genesis_") == 0 && !canPutNonDropableItemInInventory(dstInvId))
-	{
-		nlwarning("Character %s tries to move '%s' to inv %u", _Id.toString().c_str(), srcItem->getPhraseId().c_str(), dstInvId );
-		return;
-	}
-
 	// cannot move a pet animal ticket
 	if (srcForm->Family == ITEMFAMILY::PET_ANIMAL_TICKET)
 		return;
diff --git a/code/ryzom/server/src/server_share/msg_ai_service.h b/code/ryzom/server/src/server_share/msg_ai_service.h
index 0933fb23b..b4190806f 100644
--- a/code/ryzom/server/src/server_share/msg_ai_service.h
+++ b/code/ryzom/server/src/server_share/msg_ai_service.h
@@ -602,27 +602,6 @@ public:
 	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
-//----------------------------------------------------------------------------
-// AIS -> EGS ais change creature Max HP
-//----------------------------------------------------------------------------
-class CChangeCreatureMaxHPMsg : public CMirrorTransportClass
-{
-public:
-	std::vector<TDataSetRow>    Entities;
-	std::vector<uint32>         MaxHp;
-	std::vector<uint8>          SetFull;
-	
-	virtual void description ()
-	{
-		className ("CChangeCreatureMaxHPMsg");
-		propertyCont ("Entities", PropDataSetRow, Entities);
-		propertyCont ("MaxHp", PropUInt32, MaxHp);
-		propertyCont ("SetFull", PropUInt8, SetFull);
-	}
-	
-	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
-};
-
 //----------------------------------------------------------------------------
 // AIS -> EGS ais change creature Max ChaScore1
 //----------------------------------------------------------------------------