@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2008-2022 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im>
  *
  * All rights reserved.
  *
  * This file is part of ObjFW. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
@@ -14,13 +14,12 @@
  */
 
 #include "config.h"
 
 #import "OFNull.h"
-#import "OFString.h"
-#import "OFXMLElement.h"
 #import "OFData.h"
+#import "OFString.h"
 
 #import "OFInvalidArgumentException.h"
 
 @interface OFNull ()
 - (OFString *)
@@ -39,27 +38,10 @@
 + (OFNull *)null
 {
 	return null;
 }
 
-- (instancetype)initWithSerialization: (OFXMLElement *)element
-{
-	void *pool;
-
-	[self release];
-
-	pool = objc_autoreleasePoolPush();
-
-	if (![element.name isEqual: self.className] ||
-	    ![element.namespace isEqual: OFSerializationNS])
-		@throw [OFInvalidArgumentException exception];
-
-	objc_autoreleasePoolPop(pool);
-
-	return [OFNull null];
-}
-
 - (OFString *)description
 {
 	return @"<null>";
 }
 
@@ -66,25 +48,10 @@
 - (id)copy
 {
 	return self;
 }
 
-- (OFXMLElement *)XMLElementBySerializing
-{
-	void *pool = objc_autoreleasePoolPush();
-	OFXMLElement *element;
-
-	element = [OFXMLElement elementWithName: self.className
-				      namespace: OFSerializationNS];
-
-	[element retain];
-
-	objc_autoreleasePoolPop(pool);
-
-	return [element autorelease];
-}
-
 - (OFString *)JSONRepresentation
 {
 	return [self of_JSONRepresentationWithOptions: 0 depth: 0];
 }
 
@@ -111,29 +78,7 @@
 {
 	const unsigned char bytes[] = { OFASN1TagNumberNull, 0 };
 	return [OFData dataWithItems: bytes count: sizeof(bytes)];
 }
 
-- (instancetype)autorelease
-{
-	return self;
-}
-
-- (instancetype)retain
-{
-	return self;
-}
-
-- (void)release
-{
-}
-
-- (unsigned int)retainCount
-{
-	return OFMaxRetainCount;
-}
-
-- (void)dealloc
-{
-	OF_DEALLOC_UNSUPPORTED
-}
+OF_SINGLETON_METHODS
 @end