Index: src/XMPPConnection.h
==================================================================
--- src/XMPPConnection.h
+++ src/XMPPConnection.h
@@ -361,8 +361,5 @@
 				 withIQ: (XMPPIQ*)iq;
 - (OFString*)XMPP_IDNAToASCII: (OFString*)domain;
 - (XMPPMulticastDelegate*)XMPP_delegates;
 /// \endcond
 @end
-
-@interface OFObject (XMPPConnectionDelegate) <XMPPConnectionDelegate>
-@end

Index: src/XMPPConnection.m
==================================================================
--- src/XMPPConnection.m
+++ src/XMPPConnection.m
@@ -1101,56 +1101,7 @@
 }
 
 - (XMPPMulticastDelegate*)XMPP_delegates
 {
 	return delegates;
-}
-@end
-
-@implementation OFObject (XMPPConnectionDelegate)
--  (void)connection: (XMPPConnection*)connection
-  didReceiveElement: (OFXMLElement*)element
-{
-}
-
-- (void)connection: (XMPPConnection*)connection
-    didSendElement: (OFXMLElement*)element
-{
-}
-
-- (void)connectionWasAuthenticated: (XMPPConnection*)connection
-{
-}
-
-- (void)connection: (XMPPConnection*)connection
-     wasBoundToJID: (XMPPJID*)JID
-{
-}
-
-- (BOOL)connection: (XMPPConnection*)connection
-      didReceiveIQ: (XMPPIQ*)iq
-{
-	return NO;
-}
-
--   (void)connection: (XMPPConnection*)connection
-  didReceivePresence: (XMPPPresence*)presence
-{
-}
-
--  (void)connection: (XMPPConnection*)connection
-  didReceiveMessage: (XMPPMessage*)message
-{
-}
-
-- (void)connectionWasClosed: (XMPPConnection*)connection
-{
-}
-
-- (void)connectionWillUpgradeToTLS: (XMPPConnection*)connection
-{
-}
-
-- (void)connectionDidUpgradeToTLS: (XMPPConnection*)connection
-{
 }
 @end

Index: src/XMPPRoster.h
==================================================================
--- src/XMPPRoster.h
+++ src/XMPPRoster.h
@@ -151,8 +151,5 @@
 - (void)XMPP_handleInitialRosterForConnection: (XMPPConnection*)connection
 				       withIQ: (XMPPIQ*)iq;
 - (XMPPRosterItem*)XMPP_rosterItemWithXMLElement: (OFXMLElement*)element;
 /// \endcond
 @end
-
-@interface OFObject (XMPPRosterDelegate) <XMPPRosterDelegate>
-@end

Index: src/XMPPRoster.m
==================================================================
--- src/XMPPRoster.m
+++ src/XMPPRoster.m
@@ -349,18 +349,7 @@
 		[dataStorage save];
 	}
 
 	[delegates broadcastSelector: @selector(rosterWasReceived:)
 			  withObject: self];
-}
-@end
-
-@implementation OFObject (XMPPRosterDelegate)
-- (void)rosterWasReceived: (XMPPRoster*)roster
-{
-}
-
--         (void)roster: (XMPPRoster*)roster
-  didReceiveRosterItem: (XMPPRosterItem*)rosterItem
-{
 }
 @end