diff --git a/lib/confd/querylib.py b/lib/confd/querylib.py
index e1e323fd9cf86eb0acc1110b8bb0e6080b4ba328..81ea2b29c831362811fa8f1ffeb5044e0178ef09 100644
--- a/lib/confd/querylib.py
+++ b/lib/confd/querylib.py
@@ -194,11 +194,6 @@ class InstanceIpToNodePrimaryIpQuery(ConfdQuery):
         network_link = query[constants.CONFD_REQQ_LINK]
       else:
         network_link = None # default will be used
-    elif isinstance(query, basestring):
-      # 2.1 beta1 and beta2 mode, to be deprecated for 2.2
-      instances_list = [query]
-      network_link = None
-      mode = constants.CONFD_REQQ_IP
     else:
       logging.debug("Invalid query argument type for: %s", query)
       return QUERY_ARGUMENT_ERROR