diff --git a/mq/main/comm-util/src/main/java/com/sun/messaging/jmq/util/DestType.java b/mq/main/comm-util/src/main/java/com/sun/messaging/jmq/util/DestType.java
index 05ccaa4d4..51e7c27c4 100644
--- a/mq/main/comm-util/src/main/java/com/sun/messaging/jmq/util/DestType.java
+++ b/mq/main/comm-util/src/main/java/com/sun/messaging/jmq/util/DestType.java
@@ -24,7 +24,7 @@
  * <pre>
  *      1. Its type (Queue or Topic)
  *      2. Its lifespan (temporary or not)
- *      3. Its flavor (single, round robin, failover, etc)
+ *      3. Its flavor (single, round robin, etc)
  * </pre>
  *
  * In practice all combinations are not used (for example you don't have round-robin topics), but by using bitmaps we
@@ -70,12 +70,6 @@ public class DestType {
     @Deprecated
     public static final int DEST_FLAVOR_RROBIN = 0x00000200;
 
-    /**
-     * @deprecated since 3.5
-     */
-    @Deprecated
-    public static final int DEST_FLAVOR_FAILOVER = 0x00000400;
-
     /**
      * Internal destination name prefix
      *
@@ -198,14 +192,6 @@ public static boolean isRRobin(int mask) {
         return (mask & DEST_FLAVOR_RROBIN) == DEST_FLAVOR_RROBIN;
     }
 
-    /**
-     * @deprecated since 3.5
-     */
-    @Deprecated
-    public static boolean isFailover(int mask) {
-        return (mask & DEST_FLAVOR_FAILOVER) == DEST_FLAVOR_FAILOVER;
-    }
-
     public static String toString(int mask) {
         StringBuilder s = new StringBuilder();
 
@@ -237,8 +223,6 @@ public static String toString(int mask) {
             s.append(":single");
         } else if (isRRobin(mask)) {
             s.append(":roundrobin");
-        } else if (isFailover(mask)) {
-            s.append(":failover");
         }
 
         return s.toString();
diff --git a/mq/main/comm-util/src/test/java/com/sun/messaging/jmq/util/DestTypeTest.java b/mq/main/comm-util/src/test/java/com/sun/messaging/jmq/util/DestTypeTest.java
index e917f4451..6d9b7d1d7 100644
--- a/mq/main/comm-util/src/test/java/com/sun/messaging/jmq/util/DestTypeTest.java
+++ b/mq/main/comm-util/src/test/java/com/sun/messaging/jmq/util/DestTypeTest.java
@@ -60,7 +60,7 @@ class toString {
             "129, queue:admin",
             "257, queue:single",
             "513, queue:roundrobin",
-            "1025, queue:failover",
+            "1025, queue",
             "8193, queue:local",
             "8241, queue:temporary:autocreated:local",
         })
diff --git a/mq/main/mq-admin/admin-cli/src/main/java/com/sun/messaging/jmq/admin/apps/broker/BrokerCmdOptions.java b/mq/main/mq-admin/admin-cli/src/main/java/com/sun/messaging/jmq/admin/apps/broker/BrokerCmdOptions.java
index bbaad7fd7..81591f578 100644
--- a/mq/main/mq-admin/admin-cli/src/main/java/com/sun/messaging/jmq/admin/apps/broker/BrokerCmdOptions.java
+++ b/mq/main/mq-admin/admin-cli/src/main/java/com/sun/messaging/jmq/admin/apps/broker/BrokerCmdOptions.java
@@ -329,7 +329,6 @@ public String toString() {
      * Queue flavour property values
      */
     String PROP_VALUE_QUEUE_FLAVOUR_SINGLE = "s";
-    String PROP_VALUE_QUEUE_FLAVOUR_FAILOVER = "f";
     String PROP_VALUE_QUEUE_FLAVOUR_ROUNDROBIN = "r";
 
     /*
diff --git a/mq/main/mq-broker/broker-comm/src/main/java/com/sun/messaging/jmq/jmsserver/config/BrokerConfig.java b/mq/main/mq-broker/broker-comm/src/main/java/com/sun/messaging/jmq/jmsserver/config/BrokerConfig.java
index 1210cf463..5a6ec0013 100644
--- a/mq/main/mq-broker/broker-comm/src/main/java/com/sun/messaging/jmq/jmsserver/config/BrokerConfig.java
+++ b/mq/main/mq-broker/broker-comm/src/main/java/com/sun/messaging/jmq/jmsserver/config/BrokerConfig.java
@@ -441,7 +441,7 @@
  * imq.autocreate.queue.maxNumBackupConsumers=0
  *
  * // default queue delivery policy (for auto-create queues) // Choices are: // single - standard single queue receiver
- * queues // failover - failover // round-robin
+ * queues // round-robin
  *
  * // defines the number of messages queued at a time to a receiver // on a round robin queue
  * imq.queue.rr.messageblock=5
diff --git a/mq/main/mq-broker/broker-core/src/main/java/com/sun/messaging/jmq/jmsserver/core/Queue.java b/mq/main/mq-broker/broker-core/src/main/java/com/sun/messaging/jmq/jmsserver/core/Queue.java
index 5f60f9c31..dd2f41e21 100644
--- a/mq/main/mq-broker/broker-core/src/main/java/com/sun/messaging/jmq/jmsserver/core/Queue.java
+++ b/mq/main/mq-broker/broker-core/src/main/java/com/sun/messaging/jmq/jmsserver/core/Queue.java
@@ -341,9 +341,6 @@ private void setDefaultCounts(int type, boolean autocreate) throws BrokerExcepti
         if (DestType.isSingle(type)) {
             active = 1;
             failover = 0;
-        } else if (DestType.isFailover(type)) {
-            active = 1;
-            failover = UNLIMITED;
         } else if (DestType.isRRobin(type)) {
             active = UNLIMITED;
             failover = 0;