diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index f591668961df64011816cb8b8518f5880fe09b8e..135c242fe53a4bf33dfeabf7bd9ad116da99c2ad 100644
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -458,20 +458,6 @@ done:
 	return( rc );
 }
 
-#if 0
-int
-authzMatch(
-	int		*matchp,
-	slap_mask_t	flags,
-	Syntax		*syntax,
-	MatchingRule	*mr,
-	struct berval	*value,
-	void		*assertedValue )
-{
-	return octetStringMatch( matchp, flags, syntax, mr, value, assertedValue );
-}
-#endif
-
 static int
 authzPrettyNormal(
 	struct berval	*val,
diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 082833e47575cc6bed5d9f5c9c4757056648eb3f..b5cfcc1bc05a73fd0159c57a74dace837d4554ed 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -55,7 +55,6 @@
 #define csnIndexer				generalizedTimeIndexer
 #define csnFilter				generalizedTimeFilter
 
-/* FIXME: temporary */
 #define authzMatch				octetStringMatch
 
 unsigned int index_substr_if_minlen = SLAP_INDEX_SUBSTR_IF_MINLEN_DEFAULT;