diff --git a/ChangeLog b/ChangeLog
index 696cac7ff..b4ddaaabc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@
 	exmpp_stringprep:*prep/1 uses. Add table conversion.
 	(get_last): Do not convert status to binary because it's already one.
 
+	* src/mod_adhoc.erl: Remove compatibility code (not tested yet).
+
 2008-09-25  Jean-Sébastien Pédron  <js.pedron@meetic-corp.com>
 
 	* src/jlib.erl (timestamp_to_xml): Create an #xmlel element, not an
diff --git a/src/mod_adhoc.erl b/src/mod_adhoc.erl
index b1a2a7bf7..db010ef27 100644
--- a/src/mod_adhoc.erl
+++ b/src/mod_adhoc.erl
@@ -99,10 +99,7 @@ get_local_commands(Acc, _From, #jid{domain = Server, ldomain = LServer} = _To, "
     end;
 
 get_local_commands(_Acc, From, #jid{ldomain = LServer} = To, ?NS_ADHOC_s, Lang) ->
-    % XXX OLD FORMAT: From, To.
-    FromOld = jlib:to_old_jid(From),
-    ToOld = jlib:to_old_jid(To),
-    ejabberd_hooks:run_fold(adhoc_local_items, LServer, {result, []}, [FromOld, ToOld, Lang]);
+    ejabberd_hooks:run_fold(adhoc_local_items, LServer, {result, []}, [From, To, Lang]);
 
 get_local_commands(_Acc, _From, _To, "ping", _Lang) ->
     {result, []};
@@ -132,10 +129,7 @@ get_sm_commands(Acc, _From, #jid{ldomain = LServer} = To, "", Lang) ->
     end;
 
 get_sm_commands(_Acc, From, #jid{ldomain = LServer} = To, ?NS_ADHOC_s, Lang) ->
-    % XXX OLD FORMAT: From, To.
-    FromOld = jlib:to_old_jid(From),
-    ToOld = jlib:to_old_jid(To),
-    ejabberd_hooks:run_fold(adhoc_sm_items, LServer, {result, []}, [FromOld, ToOld, Lang]);
+    ejabberd_hooks:run_fold(adhoc_sm_items, LServer, {result, []}, [From, To, Lang]);
 
 get_sm_commands(Acc, _From, _To, _Node, _Lang) ->
     Acc.
@@ -223,11 +217,8 @@ process_adhoc_request(From, To, IQ_Rec, Hook) ->
             exmpp_iq:error(IQ_Rec, Error);
 	#adhoc_request{} = AdhocRequest ->
 	    Host = To#jid.ldomain,
-            % XXX OLD FORMAT: From, To.
-            FromOld = jlib:to_old_jid(From),
-            ToOld = jlib:to_old_jid(To),
 	    case ejabberd_hooks:run_fold(Hook, Host, empty,
-					 [FromOld, ToOld, AdhocRequest]) of
+					 [From, To, AdhocRequest]) of
 		ignore ->
 		    ignore;
 		empty ->