@@ -351,11 +351,11 @@
 		[cache appendCStringWithoutUTF8Checking: buf + *last
 						 length: *i - *last];
 		pi = [[cache mutableCopy] autorelease];
 		len = [pi length];
 
-		[pi removeCharactersFromIndex: len - 1
+		[pi deleteCharactersFromIndex: len - 1
 				      toIndex: len];
 
 		/*
 		 * Class swizzle the string to be immutable. We pass it as
 		 * OFString*, so it can't be modified anyway. But not swizzling
@@ -630,11 +630,11 @@
 
 	if ((len = *i - *last) > 0)
 		[cache appendCStringWithoutUTF8Checking: buf + *last
 						 length: len];
 
-	[cache removeLeadingAndTrailingWhitespaces];
+	[cache deleteLeadingAndTrailingWhitespaces];
 	cache_c = [cache cString];
 	cache_len = [cache cStringLength];
 
 	if ((tmp = memchr(cache_c, ':', cache_len)) != NULL) {
 		attrName = [[OFString alloc] initWithCString: tmp + 1
@@ -812,11 +812,11 @@
 	[cache appendCStringWithoutUTF8Checking: buf + *last
 					 length: *i - *last];
 	cdata = [[cache mutableCopy] autorelease];
 	len = [cdata length];
 
-	[cdata removeCharactersFromIndex: len - 2
+	[cdata deleteCharactersFromIndex: len - 2
 				 toIndex: len];
 
 	/*
 	 * Class swizzle the string to be immutable. We pass it as OFString*, so
 	 * it can't be modified anyway. But not swizzling it would create a
@@ -882,11 +882,11 @@
 	[cache appendCStringWithoutUTF8Checking: buf + *last
 					 length: *i - *last];
 	comment = [[cache mutableCopy] autorelease];
 	len = [comment length];
 
-	[comment removeCharactersFromIndex: len - 2
+	[comment deleteCharactersFromIndex: len - 2
 				   toIndex: len];
 
 	/*
 	 * Class swizzle the string to be immutable. We pass it as OFString*, so
 	 * it can't be modified anyway. But not swizzling it would create a