diff --git a/src/protocol/dispatcher.py b/src/protocol/dispatcher.py
index edf05d8..b00e9e9 100644
--- a/src/protocol/dispatcher.py
+++ b/src/protocol/dispatcher.py
@@ -466,13 +466,6 @@ class Dispatcher(object):
     def handle_RequestAsyncData(self, conn, msg):
         return Error('AsyncData is not (yet) supported')
 
-    def handle_ListOfFeatures(self, conn, msg):
-        # no features supported (yet)
-        return ListOfFeaturesReply([])
-
-    def handle_ActivateFeature(self, conn, msg):
-        return Error('Features are not (yet) supported')
-
     def unhandled(self, msgname, conn, msg):
         """handler for unhandled Messages
 
diff --git a/src/protocol/messages.py b/src/protocol/messages.py
index e7ffa76..a9c2397 100644
--- a/src/protocol/messages.py
+++ b/src/protocol/messages.py
@@ -161,24 +161,6 @@ class AsyncDataUnit(ReadParamReply):
     ARGS = ['devname', 'pname', 'value', 'timestamp', 'error', 'unit']
 
 
-class ListOfFeaturesRequest(Request):
-    pass
-
-
-class ListOfFeaturesReply(Reply):
-    ARGS = ['features']
-
-
-class ActivateFeatureRequest(Request):
-    ARGS = ['feature']
-
-
-class ActivateFeatureReply(Reply):
-    # Ack style or Error
-    # maybe should reply with active features?
-    pass
-
-
 # ERRORS
 ########
 
@@ -232,9 +214,3 @@ class HelpReply(Reply):
     pass
 
 
-FEATURES = [
-    'Feature1',
-    'Feature2',
-    'Feature3',
-    'Future',
-]