diff --git a/chrome/src/nsChromeUIDataSource.cpp b/chrome/src/nsChromeUIDataSource.cpp
index 03a42d03eeb..63f86b00f23 100644
--- a/chrome/src/nsChromeUIDataSource.cpp
+++ b/chrome/src/nsChromeUIDataSource.cpp
@@ -273,13 +273,6 @@ nsChromeUIDataSource::GetAllResources(nsISimpleEnumerator** aResult)
   return mComposite->GetAllResources(aResult);
 }
 
-NS_IMETHODIMP
-nsChromeUIDataSource::GetAllCommands(nsIRDFResource* source,
-                                     nsIEnumerator/*<nsIRDFResource>*/** result)
-{
-  return mComposite->GetAllCommands(source, result);
-}
-
 NS_IMETHODIMP
 nsChromeUIDataSource::GetAllCmds(nsIRDFResource* source,
                                         nsISimpleEnumerator/*<nsIRDFResource>*/** result)
diff --git a/mailnews/addrbook/src/nsAbRDFDataSource.cpp b/mailnews/addrbook/src/nsAbRDFDataSource.cpp
index dbe13a5c3c5..0ce7f3af57f 100644
--- a/mailnews/addrbook/src/nsAbRDFDataSource.cpp
+++ b/mailnews/addrbook/src/nsAbRDFDataSource.cpp
@@ -489,13 +489,6 @@ NS_IMETHODIMP nsAbRDFDataSource::GetAllResources(nsISimpleEnumerator** aCursor)
     return NS_RDF_NO_VALUE;
 }
 
-NS_IMETHODIMP
-nsAbRDFDataSource::GetAllCommands(nsIRDFResource* source,
-                                     nsIEnumerator/*<nsIRDFResource>*/** commands)
-{
-    return NS_RDF_NO_VALUE;
-}
-
 NS_IMETHODIMP
 nsAbRDFDataSource::GetAllCmds(nsIRDFResource* source,
                                       nsISimpleEnumerator/*<nsIRDFResource>*/** commands)
diff --git a/mailnews/addrbook/src/nsDirectoryDataSource.cpp b/mailnews/addrbook/src/nsDirectoryDataSource.cpp
index 9c78236d3b9..cebe3e60b5e 100644
--- a/mailnews/addrbook/src/nsDirectoryDataSource.cpp
+++ b/mailnews/addrbook/src/nsDirectoryDataSource.cpp
@@ -353,26 +353,6 @@ nsAbDirectoryDataSource::getDirectoryArcLabelsOut(nsIAbDirectory *directory,
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsAbDirectoryDataSource::GetAllCommands(nsIRDFResource* source,
-                                      nsIEnumerator/*<nsIRDFResource>*/** commands)
-{
-  nsresult rv;
-  nsCOMPtr<nsISupportsArray> cmds;
-
-  nsCOMPtr<nsIAbDirectory> directory(do_QueryInterface(source, &rv));
-  if (NS_SUCCEEDED(rv)) {
-    rv = NS_NewISupportsArray(getter_AddRefs(cmds));
-    NS_ENSURE_SUCCESS(rv, rv);
-    cmds->AppendElement(kNC_Delete);
-    cmds->AppendElement(kNC_DeleteCards);
-  }
-
-  if (cmds != nsnull)
-    return cmds->Enumerate(commands);
-  return NS_ERROR_FAILURE;
-}
-
 NS_IMETHODIMP
 nsAbDirectoryDataSource::IsCommandEnabled(nsISupportsArray/*<nsIRDFResource>*/* aSources,
                                         nsIRDFResource*   aCommand,
diff --git a/mailnews/addrbook/src/nsDirectoryDataSource.h b/mailnews/addrbook/src/nsDirectoryDataSource.h
index 68200e321fa..7151aed75b7 100644
--- a/mailnews/addrbook/src/nsDirectoryDataSource.h
+++ b/mailnews/addrbook/src/nsDirectoryDataSource.h
@@ -98,8 +98,6 @@ public:
 	NS_IMETHOD ArcLabelsOut(nsIRDFResource* source,
 						  nsISimpleEnumerator** labels); 
 
-	NS_IMETHOD GetAllCommands(nsIRDFResource* source,
-							nsIEnumerator/*<nsIRDFResource>*/** commands);
 	NS_IMETHOD IsCommandEnabled(nsISupportsArray/*<nsIRDFResource>*/* aSources,
 							  nsIRDFResource*   aCommand,
 							  nsISupportsArray/*<nsIRDFResource>*/* aArguments,
diff --git a/mailnews/base/src/nsMsgFolderDataSource.cpp b/mailnews/base/src/nsMsgFolderDataSource.cpp
index 77ee684df52..f2039568719 100644
--- a/mailnews/base/src/nsMsgFolderDataSource.cpp
+++ b/mailnews/base/src/nsMsgFolderDataSource.cpp
@@ -61,6 +61,7 @@
 #include "nsIMsgHdr.h"
 #include "nsTraceRefcnt.h"
 #include "nsIMsgFolder.h" // TO include biffState enum. Change to bool later...
+#include "nsArray.h"
 
 static NS_DEFINE_CID(kRDFServiceCID,            NS_RDFSERVICE_CID);
 static NS_DEFINE_CID(kMsgCopyServiceCID,		NS_MSGCOPYSERVICE_CID);
@@ -655,45 +656,36 @@ nsMsgFolderDataSource::GetAllResources(nsISimpleEnumerator** aCursor)
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-NS_IMETHODIMP
-nsMsgFolderDataSource::GetAllCommands(nsIRDFResource* source,
-                                      nsIEnumerator/*<nsIRDFResource>*/** commands)
-{
-  nsresult rv;
-
-  nsCOMPtr<nsISupportsArray> cmds;
-
-  nsCOMPtr<nsIMsgFolder> folder(do_QueryInterface(source, &rv));
-  if (NS_SUCCEEDED(rv)) {
-    rv = NS_NewISupportsArray(getter_AddRefs(cmds));
-    if (NS_FAILED(rv)) return rv;
-    cmds->AppendElement(kNC_Delete);
-    cmds->AppendElement(kNC_ReallyDelete);
-    cmds->AppendElement(kNC_NewFolder);
-    cmds->AppendElement(kNC_GetNewMessages);
-    cmds->AppendElement(kNC_Copy);
-    cmds->AppendElement(kNC_Move);
-    cmds->AppendElement(kNC_CopyFolder);
-    cmds->AppendElement(kNC_MoveFolder);
-    cmds->AppendElement(kNC_MarkAllMessagesRead);
-    cmds->AppendElement(kNC_Compact);
-    cmds->AppendElement(kNC_CompactAll);
-    cmds->AppendElement(kNC_Rename);
-    cmds->AppendElement(kNC_EmptyTrash);
-    cmds->AppendElement(kNC_DownloadFlagged);
-  }
-
-  if (cmds != nsnull)
-    return cmds->Enumerate(commands);
-  return NS_ERROR_FAILURE;
-}
-
 NS_IMETHODIMP
 nsMsgFolderDataSource::GetAllCmds(nsIRDFResource* source,
                                       nsISimpleEnumerator/*<nsIRDFResource>*/** commands)
 {
-  NS_NOTYETIMPLEMENTED("sorry!");
-  return NS_ERROR_NOT_IMPLEMENTED;
+  NS_NOTYETIMPLEMENTED("no one actually uses me");
+  nsresult rv;
+
+  nsCOMPtr<nsIMsgFolder> folder(do_QueryInterface(source, &rv));
+  if (NS_FAILED(rv)) return rv;
+
+  nsCOMPtr<nsIMutableArray> cmds;
+  NS_NewArray(getter_AddRefs(cmds));
+  if (!cmds) return rv;
+
+  cmds->AppendElement(kNC_Delete, PR_FALSE);
+  cmds->AppendElement(kNC_ReallyDelete, PR_FALSE);
+  cmds->AppendElement(kNC_NewFolder, PR_FALSE);
+  cmds->AppendElement(kNC_GetNewMessages, PR_FALSE);
+  cmds->AppendElement(kNC_Copy, PR_FALSE);
+  cmds->AppendElement(kNC_Move, PR_FALSE);
+  cmds->AppendElement(kNC_CopyFolder, PR_FALSE);
+  cmds->AppendElement(kNC_MoveFolder, PR_FALSE);
+  cmds->AppendElement(kNC_MarkAllMessagesRead, PR_FALSE);
+  cmds->AppendElement(kNC_Compact, PR_FALSE);
+  cmds->AppendElement(kNC_CompactAll, PR_FALSE);
+  cmds->AppendElement(kNC_Rename, PR_FALSE);
+  cmds->AppendElement(kNC_EmptyTrash, PR_FALSE);
+  cmds->AppendElement(kNC_DownloadFlagged, PR_FALSE);
+
+  return cmds->Enumerate(commands);
 }
 
 NS_IMETHODIMP
diff --git a/mailnews/base/src/nsMsgFolderDataSource.h b/mailnews/base/src/nsMsgFolderDataSource.h
index 63f5f239557..51573c85530 100644
--- a/mailnews/base/src/nsMsgFolderDataSource.h
+++ b/mailnews/base/src/nsMsgFolderDataSource.h
@@ -107,8 +107,6 @@ public:
 
   NS_IMETHOD GetAllResources(nsISimpleEnumerator** aResult);
 
-  NS_IMETHOD GetAllCommands(nsIRDFResource* source,
-                            nsIEnumerator/*<nsIRDFResource>*/** commands);
   NS_IMETHOD GetAllCmds(nsIRDFResource* source,
                             nsISimpleEnumerator/*<nsIRDFResource>*/** commands);
 
diff --git a/mailnews/base/src/nsMsgRDFDataSource.cpp b/mailnews/base/src/nsMsgRDFDataSource.cpp
index 46116b43fcc..12ab4b39ba1 100644
--- a/mailnews/base/src/nsMsgRDFDataSource.cpp
+++ b/mailnews/base/src/nsMsgRDFDataSource.cpp
@@ -287,15 +287,7 @@ nsMsgRDFDataSource::GetAllResources(nsISimpleEnumerator **_retval)
 }
 
 
-/* nsIEnumerator GetAllCommands (in nsIRDFResource aSource); */
-NS_IMETHODIMP
-nsMsgRDFDataSource::GetAllCommands(nsIRDFResource *aSource, nsIEnumerator **_retval)
-{
-    return NS_RDF_NO_VALUE;
-}
-
-
-/* nsISimpleEnumerator GetAllCommands (in nsIRDFResource aSource); */
+/* nsISimpleEnumerator GetAllCmds (in nsIRDFResource aSource); */
 NS_IMETHODIMP
 nsMsgRDFDataSource::GetAllCmds(nsIRDFResource *aSource, nsISimpleEnumerator **_retval)
 {
diff --git a/mailnews/base/src/nsSoundDatasource.cpp b/mailnews/base/src/nsSoundDatasource.cpp
index 2c95155a1df..a25241b19a8 100644
--- a/mailnews/base/src/nsSoundDatasource.cpp
+++ b/mailnews/base/src/nsSoundDatasource.cpp
@@ -554,12 +554,6 @@ nsSoundDatasource::GetSources(nsIRDFResource *aProperty, nsIRDFNode *aTarget, PR
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-NS_IMETHODIMP 
-nsSoundDatasource::GetAllCommands(nsIRDFResource *aSource, nsIEnumerator **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
 NS_IMETHODIMP
 nsSoundDatasource::AddObserver(nsIRDFObserver *n)
 {
diff --git a/mailnews/base/src/nsSubscribeDataSource.cpp b/mailnews/base/src/nsSubscribeDataSource.cpp
index 8b31d71e524..aa7f3bada79 100644
--- a/mailnews/base/src/nsSubscribeDataSource.cpp
+++ b/mailnews/base/src/nsSubscribeDataSource.cpp
@@ -727,12 +727,6 @@ nsSubscribeDataSource::GetSources(nsIRDFResource *aProperty, nsIRDFNode *aTarget
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-NS_IMETHODIMP 
-nsSubscribeDataSource::GetAllCommands(nsIRDFResource *aSource, nsIEnumerator **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
 NS_IMETHODIMP
 nsSubscribeDataSource::NotifyObservers(nsIRDFResource *subject,
                                                 nsIRDFResource *property,
diff --git a/mailnews/compose/src/nsSmtpDataSource.cpp b/mailnews/compose/src/nsSmtpDataSource.cpp
index 6df41df82e6..d982223779c 100644
--- a/mailnews/compose/src/nsSmtpDataSource.cpp
+++ b/mailnews/compose/src/nsSmtpDataSource.cpp
@@ -404,12 +404,6 @@ NS_IMETHODIMP nsSmtpDataSource::GetAllResources(nsISimpleEnumerator **aResult)
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-/* nsIEnumerator GetAllCommands (in nsIRDFResource aSource); */
-NS_IMETHODIMP nsSmtpDataSource::GetAllCommands(nsIRDFResource *aSource, nsIEnumerator **aResult)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
 /* boolean IsCommandEnabled (in nsISupportsArray aSources, in nsIRDFResource aCommand, in nsISupportsArray aArguments); */
 NS_IMETHODIMP nsSmtpDataSource::IsCommandEnabled(nsISupportsArray *aSources, nsIRDFResource *aCommand, nsISupportsArray *aArguments, PRBool *aResult)
 {
diff --git a/rdf/base/idl/nsIRDFDataSource.idl b/rdf/base/idl/nsIRDFDataSource.idl
index 4dc8c7f73ce..906db619848 100644
--- a/rdf/base/idl/nsIRDFDataSource.idl
+++ b/rdf/base/idl/nsIRDFDataSource.idl
@@ -187,11 +187,6 @@ interface nsIRDFDataSource : nsISupports
      */
     nsISimpleEnumerator GetAllResources();
 
-    /**
-     * Returns the set of all commands defined for a given source.
-     */
-    nsIEnumerator GetAllCommands(in nsIRDFResource aSource);
-
     /**
      * Returns whether a given command is enabled for a set of sources. 
      */
diff --git a/rdf/base/src/nsCompositeDataSource.cpp b/rdf/base/src/nsCompositeDataSource.cpp
index bfced5a88d4..3c42ca8b61c 100644
--- a/rdf/base/src/nsCompositeDataSource.cpp
+++ b/rdf/base/src/nsCompositeDataSource.cpp
@@ -1284,82 +1284,6 @@ CompositeDataSourceImpl::GetAllResources(nsISimpleEnumerator** aResult)
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-#if 0
-/*
- * shaver 19990824: until Composite is made to implement 
- * nsIRDFRemoteDataSource, we don't need or want this.  When it does implement
- * nsIRDFRemoteDataSource, we should do a similar thing with Refresh and
- * make a no-op Init.  I'll be back to finish that off later.
- */
-
-NS_IMETHODIMP
-CompositeDataSourceImpl::Flush()
-{
-    for (PRInt32 i = mDataSources.Count() - 1; i >= 0; --i) {
-        nsIRDFDataSource* ds = NS_STATIC_CAST(nsIRDFDataSource*, mDataSources[i]);
-        nsCOMPtr<nsIRDFRemoteDataSource> remote = do_QueryInterface(ds);
-        if (remote)
-            remote->Flush();
-    }
-    return NS_OK;
-}
-#endif
-
-#if 0
-NS_IMETHODIMP
-CompositeDataSourceImpl::GetEnabledCommands(nsISupportsArray* aSources,
-                                            nsISupportsArray* aArguments,
-                                            nsIEnumerator**   aResult)
-{
-    nsCOMPtr<nsIEnumerator> commands;        // union of enabled commands
-    for (PRInt32 i = mDataSources.Count() - 1; i >= 0; --i) {
-        nsIRDFDataSource* ds = NS_STATIC_CAST(nsIRDFDataSource*, mDataSources[i]);
-        nsIEnumerator* dsCmds;
-        nsresult rv = ds->GetEnabledCommands(aSources, aArguments, &dsCmds);
-        if (NS_SUCCEEDED(rv)) {
-            if (commands == nsnull) {
-                commands = dont_QueryInterface(dsCmds);
-            }
-            else {
-                nsIEnumerator* unionCmds;
-                rv = NS_NewUnionEnumerator(commands, dsCmds, &unionCmds);
-                if (NS_FAILED(rv)) return rv;
-                NS_RELEASE(dsCmds);
-                commands = dont_QueryInterface(unionCmds);
-            }
-        }
-    }
-    *aResult = commands;
-    return NS_OK;
-}
-#endif
-
-NS_IMETHODIMP
-CompositeDataSourceImpl::GetAllCommands(nsIRDFResource* source,
-                                        nsIEnumerator/*<nsIRDFResource>*/** result)
-{
-    nsCOMPtr<nsIEnumerator> commands;        // union of enabled commands
-    for (PRInt32 i = mDataSources.Count() - 1; i >= 0; --i) {
-        nsIRDFDataSource* ds = NS_STATIC_CAST(nsIRDFDataSource*, mDataSources[i]);
-        nsIEnumerator* dsCmds;
-        nsresult rv = ds->GetAllCommands(source, &dsCmds);
-        if (NS_SUCCEEDED(rv)) {
-            if (commands == nsnull) {
-                commands = dont_QueryInterface(dsCmds);
-            }
-            else {
-                nsIEnumerator* unionCmds;
-                rv = NS_NewUnionEnumerator(commands, dsCmds, &unionCmds);
-                if (NS_FAILED(rv)) return rv;
-                NS_RELEASE(dsCmds);
-                commands = dont_QueryInterface(unionCmds);
-            }
-        }
-    }
-    *result = commands;
-    return NS_OK;
-}
-
 NS_IMETHODIMP
 CompositeDataSourceImpl::GetAllCmds(nsIRDFResource* source,
                                         nsISimpleEnumerator/*<nsIRDFResource>*/** result)
diff --git a/rdf/base/src/nsInMemoryDataSource.cpp b/rdf/base/src/nsInMemoryDataSource.cpp
index f09aba1bde4..cc39b442a0e 100644
--- a/rdf/base/src/nsInMemoryDataSource.cpp
+++ b/rdf/base/src/nsInMemoryDataSource.cpp
@@ -1834,14 +1834,6 @@ InMemoryDataSource::GetAllResources(nsISimpleEnumerator** aResult)
     return NS_OK;
 }
 
-NS_IMETHODIMP
-InMemoryDataSource::GetAllCommands(nsIRDFResource* source,
-                                   nsIEnumerator/*<nsIRDFResource>*/** commands)
-{
-    NS_NOTYETIMPLEMENTED("write me!");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
 NS_IMETHODIMP
 InMemoryDataSource::GetAllCmds(nsIRDFResource* source,
                                nsISimpleEnumerator/*<nsIRDFResource>*/** commands)
diff --git a/rdf/base/src/nsRDFXMLDataSource.cpp b/rdf/base/src/nsRDFXMLDataSource.cpp
index f887db84618..381f754cfbd 100644
--- a/rdf/base/src/nsRDFXMLDataSource.cpp
+++ b/rdf/base/src/nsRDFXMLDataSource.cpp
@@ -343,11 +343,6 @@ public:
         return mInner->GetAllResources(aResult);
     }
 
-    NS_IMETHOD GetAllCommands(nsIRDFResource* source,
-                              nsIEnumerator/*<nsIRDFResource>*/** commands) {
-        return mInner->GetAllCommands(source, commands);
-    }
-
     NS_IMETHOD GetAllCmds(nsIRDFResource* source,
                               nsISimpleEnumerator/*<nsIRDFResource>*/** commands) {
         return mInner->GetAllCmds(source, commands);
diff --git a/rdf/chrome/src/nsChromeUIDataSource.cpp b/rdf/chrome/src/nsChromeUIDataSource.cpp
index 03a42d03eeb..63f86b00f23 100644
--- a/rdf/chrome/src/nsChromeUIDataSource.cpp
+++ b/rdf/chrome/src/nsChromeUIDataSource.cpp
@@ -273,13 +273,6 @@ nsChromeUIDataSource::GetAllResources(nsISimpleEnumerator** aResult)
   return mComposite->GetAllResources(aResult);
 }
 
-NS_IMETHODIMP
-nsChromeUIDataSource::GetAllCommands(nsIRDFResource* source,
-                                     nsIEnumerator/*<nsIRDFResource>*/** result)
-{
-  return mComposite->GetAllCommands(source, result);
-}
-
 NS_IMETHODIMP
 nsChromeUIDataSource::GetAllCmds(nsIRDFResource* source,
                                         nsISimpleEnumerator/*<nsIRDFResource>*/** result)
diff --git a/rdf/datasource/src/nsFileSystemDataSource.cpp b/rdf/datasource/src/nsFileSystemDataSource.cpp
index c5bedf28b67..eb0f23290f0 100644
--- a/rdf/datasource/src/nsFileSystemDataSource.cpp
+++ b/rdf/datasource/src/nsFileSystemDataSource.cpp
@@ -1038,16 +1038,6 @@ FileSystemDataSource::RemoveObserver(nsIRDFObserver *n)
 
 
 
-NS_IMETHODIMP
-FileSystemDataSource::GetAllCommands(nsIRDFResource* source,
-                                     nsIEnumerator/*<nsIRDFResource>*/** commands)
-{
-    NS_NOTYETIMPLEMENTED("write me!");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-
 NS_IMETHODIMP
 FileSystemDataSource::GetAllCmds(nsIRDFResource* source,
                                      nsISimpleEnumerator/*<nsIRDFResource>*/** commands)
diff --git a/rdf/datasource/src/nsLocalStore.cpp b/rdf/datasource/src/nsLocalStore.cpp
index 63d1918a8aa..909d3f6bb09 100644
--- a/rdf/datasource/src/nsLocalStore.cpp
+++ b/rdf/datasource/src/nsLocalStore.cpp
@@ -202,9 +202,6 @@ public:
         return mInner->GetAllResources(aResult);
     }
 
-    NS_IMETHOD GetAllCommands(nsIRDFResource* aSource,
-                              nsIEnumerator/*<nsIRDFResource>*/** aCommands);
-
     NS_IMETHOD GetAllCmds(nsIRDFResource* aSource,
                               nsISimpleEnumerator/*<nsIRDFResource>*/** aCommands);
 
@@ -474,16 +471,6 @@ LocalStoreImpl::GetURI(char* *aURI)
 }
 
 
-
-NS_IMETHODIMP
-LocalStoreImpl::GetAllCommands(nsIRDFResource* aSource,
-                               nsIEnumerator/*<nsIRDFResource>*/** aCommands)
-{
-    // XXX Although this is the wrong thing to do, it works. I'll file a
-    // bug to fix it.
-    return NS_ERROR_FAILURE;
-}
-
 NS_IMETHODIMP
 LocalStoreImpl::GetAllCmds(nsIRDFResource* aSource,
                                nsISimpleEnumerator/*<nsIRDFResource>*/** aCommands)
diff --git a/rdf/tests/dsds/nsRDFDOMDataSource.cpp b/rdf/tests/dsds/nsRDFDOMDataSource.cpp
index d4e39cc6c8d..11f0ce2b020 100644
--- a/rdf/tests/dsds/nsRDFDOMDataSource.cpp
+++ b/rdf/tests/dsds/nsRDFDOMDataSource.cpp
@@ -97,9 +97,6 @@ class nsRDFDOMDataSource : public nsISupports {
   /* void Flush (); */
   NS_IMETHOD Flush() = 0;
 
-  /* nsIEnumerator GetAllCommands (in nsIRDFResource aSource); */
-  NS_IMETHOD GetAllCommands(nsIRDFResource *aSource, nsIEnumerator **_retval) = 0;
-
   /* nsISimpleEnumerator GetAllCmds (in nsIRDFResource aSource); */
   NS_IMETHOD GetAllCmds(nsIRDFResource *aSource, nsISimpleEnumerator **_retval) = 0;
 
diff --git a/rdf/tests/dsds/nsRDFDataSourceDS.cpp b/rdf/tests/dsds/nsRDFDataSourceDS.cpp
index 1ca9507dce3..4b96e0b2174 100644
--- a/rdf/tests/dsds/nsRDFDataSourceDS.cpp
+++ b/rdf/tests/dsds/nsRDFDataSourceDS.cpp
@@ -114,9 +114,6 @@ public:
   /* void Flush (); */
   NS_IMETHOD Flush();
 
-  /* nsIEnumerator GetAllCommands (in nsIRDFResource aSource); */
-  NS_IMETHOD GetAllCommands(nsIRDFResource *aSource, nsIEnumerator **_retval);
-
   /* boolean IsCommandEnabled (in nsISupportsArray aSources, in nsIRDFResource aCommand, in nsISupportsArray aArguments); */
   NS_IMETHOD IsCommandEnabled(nsISupportsArray * aSources, nsIRDFResource *aCommand, nsISupportsArray * aArguments, PRBool *_retval);
 
@@ -437,13 +434,6 @@ nsRDFDataSourceDataSource::Flush()
   return NS_RDF_NO_VALUE;
 }
 
-/* nsIEnumerator GetAllCommands (in nsIRDFResource aSource); */
-NS_IMETHODIMP
-nsRDFDataSourceDataSource::GetAllCommands(nsIRDFResource *aSource, nsIEnumerator **_retval)
-{
-  return NS_RDF_NO_VALUE;
-}
-
 /* boolean IsCommandEnabled (in nsISupportsArray aSources, in nsIRDFResource aCommand, in nsISupportsArray aArguments); */
 NS_IMETHODIMP
 nsRDFDataSourceDataSource::IsCommandEnabled(nsISupportsArray * aSources, nsIRDFResource *aCommand, nsISupportsArray * aArguments, PRBool *_retval)
diff --git a/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/xpfe/components/bookmarks/src/nsBookmarksService.cpp
index 4155397ab50..6045bf17a7f 100644
--- a/xpfe/components/bookmarks/src/nsBookmarksService.cpp
+++ b/xpfe/components/bookmarks/src/nsBookmarksService.cpp
@@ -4046,16 +4046,6 @@ nsBookmarksService::GetAllResources(nsISimpleEnumerator** aResult)
   return mInner->GetAllResources(aResult);
 }
 
-NS_IMETHODIMP
-nsBookmarksService::GetAllCommands(nsIRDFResource* source,
-				   nsIEnumerator/*<nsIRDFResource>*/** commands)
-{
-	NS_NOTYETIMPLEMENTED("write me!");
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-
 NS_IMETHODIMP
 nsBookmarksService::GetAllCmds(nsIRDFResource* source,
 			       nsISimpleEnumerator/*<nsIRDFResource>*/** commands)
diff --git a/xpfe/components/bookmarks/src/nsBookmarksService.h b/xpfe/components/bookmarks/src/nsBookmarksService.h
index 6f356a88b5a..cf1dcc9351d 100644
--- a/xpfe/components/bookmarks/src/nsBookmarksService.h
+++ b/xpfe/components/bookmarks/src/nsBookmarksService.h
@@ -229,9 +229,6 @@ public:
 
 	NS_IMETHOD GetAllResources(nsISimpleEnumerator** aResult);
 
-	NS_IMETHOD GetAllCommands(nsIRDFResource* source,
-				  nsIEnumerator/*<nsIRDFResource>*/** commands);
-
 	NS_IMETHOD GetAllCmds(nsIRDFResource* source,
                               nsISimpleEnumerator/*<nsIRDFResource>*/** commands);
 
diff --git a/xpfe/components/directory/nsDirectoryViewer.cpp b/xpfe/components/directory/nsDirectoryViewer.cpp
index bdb7199f4c3..09bc6dabd7a 100644
--- a/xpfe/components/directory/nsDirectoryViewer.cpp
+++ b/xpfe/components/directory/nsDirectoryViewer.cpp
@@ -1282,17 +1282,6 @@ nsHTTPIndex::GetAllResources(nsISimpleEnumerator **_retval)
 	return(rv);
 }
 
-NS_IMETHODIMP
-nsHTTPIndex::GetAllCommands(nsIRDFResource *aSource, nsIEnumerator **_retval)
-{
-	nsresult	rv = NS_ERROR_UNEXPECTED;
-	if (mInner)
-	{
-		rv = mInner->GetAllCommands(aSource, _retval);
-	}
-	return(rv);
-}
-
 NS_IMETHODIMP
 nsHTTPIndex::IsCommandEnabled(nsISupportsArray *aSources, nsIRDFResource *aCommand,
 				nsISupportsArray *aArguments, PRBool *_retval)
diff --git a/xpfe/components/history/src/nsGlobalHistory.cpp b/xpfe/components/history/src/nsGlobalHistory.cpp
index df6bfbc698e..f4516962e84 100644
--- a/xpfe/components/history/src/nsGlobalHistory.cpp
+++ b/xpfe/components/history/src/nsGlobalHistory.cpp
@@ -2132,14 +2132,6 @@ nsGlobalHistory::ArcLabelsOut(nsIRDFResource* aSource,
   }
 }
 
-NS_IMETHODIMP
-nsGlobalHistory::GetAllCommands(nsIRDFResource* aSource,
-                                nsIEnumerator/*<nsIRDFResource>*/** aCommands)
-{
-  NS_NOTYETIMPLEMENTED("sorry");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
 NS_IMETHODIMP
 nsGlobalHistory::GetAllCmds(nsIRDFResource* aSource,
                             nsISimpleEnumerator/*<nsIRDFResource>*/** aCommands)
diff --git a/xpfe/components/intl/nsCharsetMenu.cpp b/xpfe/components/intl/nsCharsetMenu.cpp
index 01311853d09..186bbfdb5d8 100644
--- a/xpfe/components/intl/nsCharsetMenu.cpp
+++ b/xpfe/components/intl/nsCharsetMenu.cpp
@@ -1962,14 +1962,6 @@ NS_IMETHODIMP nsCharsetMenu::GetAllResources(nsISimpleEnumerator** aCursor)
   return mInner->GetAllResources(aCursor);
 }
 
-NS_IMETHODIMP nsCharsetMenu::GetAllCommands(
-                             nsIRDFResource* source,
-                             nsIEnumerator/*<nsIRDFResource>*/** commands)
-{
-  NS_NOTYETIMPLEMENTED("write me!");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
 NS_IMETHODIMP nsCharsetMenu::GetAllCmds(
                              nsIRDFResource* source,
                              nsISimpleEnumerator/*<nsIRDFResource>*/** commands)
diff --git a/xpfe/components/regviewer/nsRegistryDataSource.cpp b/xpfe/components/regviewer/nsRegistryDataSource.cpp
index 9de855aa274..4b569bf9fb9 100644
--- a/xpfe/components/regviewer/nsRegistryDataSource.cpp
+++ b/xpfe/components/regviewer/nsRegistryDataSource.cpp
@@ -660,14 +660,6 @@ nsRegistryDataSource::GetAllResources(nsISimpleEnumerator **_retval)
 }
 
 
-NS_IMETHODIMP
-nsRegistryDataSource::GetAllCommands(nsIRDFResource *aSource, nsIEnumerator **_retval)
-{
-    NS_NOTYETIMPLEMENTED("write me");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
 NS_IMETHODIMP
 nsRegistryDataSource::IsCommandEnabled(nsISupportsArray *aSources, nsIRDFResource *aCommand, nsISupportsArray *aArguments, PRBool *_retval)
 {
diff --git a/xpfe/components/related/src/nsRelatedLinksHandler.cpp b/xpfe/components/related/src/nsRelatedLinksHandler.cpp
index 9939a81eb51..83dfb60c180 100644
--- a/xpfe/components/related/src/nsRelatedLinksHandler.cpp
+++ b/xpfe/components/related/src/nsRelatedLinksHandler.cpp
@@ -937,15 +937,6 @@ RelatedLinksHandlerImpl::RemoveObserver(nsIRDFObserver *aObserver)
 
 
 
-NS_IMETHODIMP
-RelatedLinksHandlerImpl::GetAllCommands(nsIRDFResource* aSource,
-					nsIEnumerator/*<nsIRDFResource>*/** aCommands)
-{
-	return mInner->GetAllCommands(aSource, aCommands);
-}
-
-
-
 NS_IMETHODIMP
 RelatedLinksHandlerImpl::GetAllCmds(nsIRDFResource* aSource,
 					nsISimpleEnumerator/*<nsIRDFResource>*/** aCommands)
diff --git a/xpfe/components/search/src/nsInternetSearchService.cpp b/xpfe/components/search/src/nsInternetSearchService.cpp
index c994c94273c..a3c6ae5d23c 100755
--- a/xpfe/components/search/src/nsInternetSearchService.cpp
+++ b/xpfe/components/search/src/nsInternetSearchService.cpp
@@ -1713,16 +1713,6 @@ InternetSearchDataSource::RemoveObserver(nsIRDFObserver *aObserver)
 
 
 
-NS_IMETHODIMP
-InternetSearchDataSource::GetAllCommands(nsIRDFResource* source,
-                                     nsIEnumerator/*<nsIRDFResource>*/** commands)
-{
-	NS_NOTYETIMPLEMENTED("write me!");
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-
 NS_IMETHODIMP
 InternetSearchDataSource::GetAllCmds(nsIRDFResource* source,
                                      nsISimpleEnumerator/*<nsIRDFResource>*/** commands)
diff --git a/xpfe/components/search/src/nsLocalSearchService.cpp b/xpfe/components/search/src/nsLocalSearchService.cpp
index d0d5be8768f..5824b17f3b3 100755
--- a/xpfe/components/search/src/nsLocalSearchService.cpp
+++ b/xpfe/components/search/src/nsLocalSearchService.cpp
@@ -955,15 +955,6 @@ LocalSearchDataSource::RemoveObserver(nsIRDFObserver *n)
 
 
 
-NS_IMETHODIMP
-LocalSearchDataSource::GetAllCommands(nsIRDFResource* source,nsIEnumerator/*<nsIRDFResource>*/** commands)
-{
-	NS_NOTYETIMPLEMENTED("write me!");
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-
 NS_IMETHODIMP
 LocalSearchDataSource::GetAllCmds(nsIRDFResource* source, nsISimpleEnumerator/*<nsIRDFResource>*/** commands)
 {
diff --git a/xpfe/components/windowds/nsWindowDataSource.cpp b/xpfe/components/windowds/nsWindowDataSource.cpp
index f2f90e671f8..be163f931c1 100644
--- a/xpfe/components/windowds/nsWindowDataSource.cpp
+++ b/xpfe/components/windowds/nsWindowDataSource.cpp
@@ -534,14 +534,6 @@ NS_IMETHODIMP nsWindowDataSource::GetAllResources(nsISimpleEnumerator **_retval)
     return NS_OK;
 }
 
-/* nsIEnumerator GetAllCommands (in nsIRDFResource aSource); */
-NS_IMETHODIMP nsWindowDataSource::GetAllCommands(nsIRDFResource *aSource, nsIEnumerator **_retval)
-{
-    if (mInner)
-        return mInner->GetAllCommands(aSource, _retval);
-    return NS_OK;
-}
-
 /* boolean IsCommandEnabled (in nsISupportsArray aSources, in nsIRDFResource aCommand, in nsISupportsArray aArguments); */
 NS_IMETHODIMP nsWindowDataSource::IsCommandEnabled(nsISupportsArray *aSources, nsIRDFResource *aCommand, nsISupportsArray *aArguments, PRBool *_retval)
 {