5 files changed, 6 insertions, 8 deletions
diff --git a/cpp/demo/Freeze/library/Library.ice b/cpp/demo/Freeze/library/Library.ice
index 284ce2efcd8..a2bb43d7685 100644
--- a/cpp/demo/Freeze/library/Library.ice
+++ b/cpp/demo/Freeze/library/Library.ice
@@ -89,7 +89,7 @@ class Book
      * database system.
      *
      **/
-    idempotent void destroy()
+    void destroy()
 	throws DatabaseException;
 
     /**
diff --git a/cpp/demo/Freeze/phonebook/PhoneBook.ice b/cpp/demo/Freeze/phonebook/PhoneBook.ice
index ea2af8cf168..553ce8b6b81 100644
--- a/cpp/demo/Freeze/phonebook/PhoneBook.ice
+++ b/cpp/demo/Freeze/phonebook/PhoneBook.ice
@@ -30,7 +30,7 @@ class Contact
     nonmutating string getPhone();
     idempotent void setPhone(string phone);
 
-    idempotent void destroy()
+    void destroy()
 	throws DatabaseException;
 
     string name;
diff --git a/cpp/slice/IceStorm/IceStorm.ice b/cpp/slice/IceStorm/IceStorm.ice
index 400b385486f..1255c2ac403 100644
--- a/cpp/slice/IceStorm/IceStorm.ice
+++ b/cpp/slice/IceStorm/IceStorm.ice
@@ -129,7 +129,7 @@ interface Topic
      * Destroy the Topic.
      *
      **/
-    idempotent void destroy();
+    void destroy();
 };
 
 /**
diff --git a/java/demo/Freeze/library/Library.ice b/java/demo/Freeze/library/Library.ice
index c557ddfba1b..a2bb43d7685 100644
--- a/java/demo/Freeze/library/Library.ice
+++ b/java/demo/Freeze/library/Library.ice
@@ -83,15 +83,13 @@ class Book
 
     /**
      *
-     * Destroy the book. [destroy] is nonmutating. It doesn't change
-     * the state of the Book. It removes the Book completely, but
-     * doesn't touch state.
+     * Destroy the book.
      *
      * @throws DatabaseException Raised if there is a problem with the
      * database system.
      *
      **/
-    idempotent void destroy()
+    void destroy()
 	throws DatabaseException;
 
     /**
diff --git a/java/demo/Freeze/phonebook/PhoneBook.ice b/java/demo/Freeze/phonebook/PhoneBook.ice
index d79574e4147..f5c68b9ee06 100644
--- a/java/demo/Freeze/phonebook/PhoneBook.ice
+++ b/java/demo/Freeze/phonebook/PhoneBook.ice
@@ -29,7 +29,7 @@ class Contact
     nonmutating string getPhone();
     void setPhone(string phone);
 
-    idempotent void destroy() throws DatabaseException;
+    void destroy() throws DatabaseException;
 
     string name;
     string address;