diff --git a/examples/examplefilter.cc b/examples/examplefilter.cc
index 4b9e52822..913b66719 100644
--- a/examples/examplefilter.cc
+++ b/examples/examplefilter.cc
@@ -50,7 +50,7 @@ ExampleFilter::~ExampleFilter()
 }
 
 // static
-ExampleFilter* ExampleFilter::create(const char* zName, char** pzOptions, MXS_CONFIG_PARAMETER* pParams)
+ExampleFilter* ExampleFilter::create(const char* zName, MXS_CONFIG_PARAMETER* pParams)
 {
     return new ExampleFilter();
 }
diff --git a/examples/examplefilter.hh b/examples/examplefilter.hh
index da444d40c..104b341c9 100644
--- a/examples/examplefilter.hh
+++ b/examples/examplefilter.hh
@@ -26,7 +26,7 @@ public:
     ~ExampleFilter();
 
     // Creates a new filter instance
-    static ExampleFilter* create(const char* zName, char** pzOptions, MXS_CONFIG_PARAMETER* ppParams);
+    static ExampleFilter* create(const char* zName, MXS_CONFIG_PARAMETER* ppParams);
 
     // Creates a new session for this filter
     ExampleFilterSession* newSession(MXS_SESSION* pSession);
diff --git a/examples/testfilter.c b/examples/testfilter.c
index 0f5015c55..1a0978e10 100644
--- a/examples/testfilter.c
+++ b/examples/testfilter.c
@@ -29,7 +29,7 @@
  * @endverbatim
  */
 
-static MXS_FILTER *createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params);
+static MXS_FILTER *createInstance(const char *name, MXS_CONFIG_PARAMETER *params);
 static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
 static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
 static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
@@ -116,7 +116,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
  * @return The instance data for this new instance
  */
 static  MXS_FILTER  *
-createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
+createInstance(const char *name, MXS_CONFIG_PARAMETER *params)
 {
     TEST_INSTANCE   *my_instance;
 
diff --git a/include/maxscale/filter.h b/include/maxscale/filter.h
index 33fee5630..3531c443b 100644
--- a/include/maxscale/filter.h
+++ b/include/maxscale/filter.h
@@ -84,12 +84,11 @@ typedef struct mxs_filter_object
      * other API functions.
      *
      * @param name    Name of the filter instance
-     * @param options Filter options
      * @param params  Filter parameters
      *
      * @return New filter instance on NULL on error
      */
-    MXS_FILTER *(*createInstance)(const char *name, char **options, MXS_CONFIG_PARAMETER *params);
+    MXS_FILTER *(*createInstance)(const char *name, MXS_CONFIG_PARAMETER *params);
 
     /**
      * Called to create a new user session within the filter
diff --git a/include/maxscale/filter.hh b/include/maxscale/filter.hh
index 511e2c15f..90e200d26 100644
--- a/include/maxscale/filter.hh
+++ b/include/maxscale/filter.hh
@@ -228,11 +228,11 @@ template<class FilterType, class FilterSessionType>
 class Filter : public MXS_FILTER
 {
 public:
-    static MXS_FILTER* createInstance(const char* zName, char** pzOptions, MXS_CONFIG_PARAMETER* ppParams)
+    static MXS_FILTER* createInstance(const char* zName, MXS_CONFIG_PARAMETER* ppParams)
     {
         FilterType* pFilter = NULL;
 
-        MXS_EXCEPTION_GUARD(pFilter = FilterType::create(zName, pzOptions, ppParams));
+        MXS_EXCEPTION_GUARD(pFilter = FilterType::create(zName, ppParams));
 
         return pFilter;
     }
diff --git a/server/core/config.cc b/server/core/config.cc
index d7ed5b19b..c98ce383a 100644
--- a/server/core/config.cc
+++ b/server/core/config.cc
@@ -3689,17 +3689,6 @@ int create_new_filter(CONFIG_CONTEXT *obj)
         if ((obj->element = filter_alloc(obj->object, module)))
         {
             MXS_FILTER_DEF* filter_def = (MXS_FILTER_DEF*)obj->element;
-            char *options = config_get_value(obj->parameters, CN_OPTIONS);
-            if (options)
-            {
-                char *lasts;
-                char *s = strtok_r(options, ",", &lasts);
-                while (s)
-                {
-                    filter_add_option(filter_def, s);
-                    s = strtok_r(NULL, ",", &lasts);
-                }
-            }
 
             const MXS_MODULE *mod = get_module(module, MODULE_FILTER);
 
diff --git a/server/core/filter.cc b/server/core/filter.cc
index 65ee84d1c..a0e9dc14a 100644
--- a/server/core/filter.cc
+++ b/server/core/filter.cc
@@ -70,7 +70,6 @@ filter_alloc(const char *name, const char *module)
     filter->name = my_name;
     filter->module = my_module;
     filter->filter = NULL;
-    filter->options = NULL;
     filter->obj = NULL;
     filter->parameters = NULL;
 
@@ -122,15 +121,6 @@ filter_free(MXS_FILTER_DEF *filter)
         MXS_FREE(filter->name);
         MXS_FREE(filter->module);
 
-        if (filter->options)
-        {
-            for (int i = 0; filter->options[i]; i++)
-            {
-                MXS_FREE(filter->options[i]);
-            }
-            MXS_FREE(filter->options);
-        }
-
         filter_free_parameters(filter);
 
         MXS_FREE(filter);
@@ -204,15 +194,6 @@ dprintAllFilters(DCB *dcb)
     {
         dcb_printf(dcb, "Filter %p (%s)\n", ptr, ptr->name);
         dcb_printf(dcb, "\tModule:      %s\n", ptr->module);
-        if (ptr->options)
-        {
-            dcb_printf(dcb, "\tOptions:     ");
-            for (i = 0; ptr->options && ptr->options[i]; i++)
-            {
-                dcb_printf(dcb, "%s ", ptr->options[i]);
-            }
-            dcb_printf(dcb, "\n");
-        }
         if (ptr->obj && ptr->filter)
         {
             ptr->obj->diagnostics(ptr->filter, NULL, dcb);
@@ -239,15 +220,6 @@ dprintFilter(DCB *dcb, const MXS_FILTER_DEF *filter)
 
     dcb_printf(dcb, "Filter %p (%s)\n", filter, filter->name);
     dcb_printf(dcb, "\tModule:      %s\n", filter->module);
-    if (filter->options)
-    {
-        dcb_printf(dcb, "\tOptions:     ");
-        for (i = 0; filter->options && filter->options[i]; i++)
-        {
-            dcb_printf(dcb, "%s ", filter->options[i]);
-        }
-        dcb_printf(dcb, "\n");
-    }
     if (filter->obj && filter->filter)
     {
         filter->obj->diagnostics(filter->filter, NULL, dcb);
@@ -278,10 +250,6 @@ dListFilters(DCB *dcb)
     {
         dcb_printf(dcb, "%-19s | %-15s | ",
                    ptr->name, ptr->module);
-        for (i = 0; ptr->options && ptr->options[i]; i++)
-        {
-            dcb_printf(dcb, "%s ", ptr->options[i]);
-        }
         dcb_printf(dcb, "\n");
         ptr = ptr->next;
     }
@@ -293,41 +261,6 @@ dListFilters(DCB *dcb)
     spinlock_release(&filter_spin);
 }
 
-/**
- * Add a router option to a service
- *
- * @param filter        The filter to add the option to
- * @param option        The option string
- */
-void
-filter_add_option(MXS_FILTER_DEF *filter, const char *option)
-{
-    int i;
-
-    spinlock_acquire(&filter->spin);
-    if (filter->options == NULL)
-    {
-        filter->options = (char **)MXS_CALLOC(2, sizeof(char *));
-        MXS_ABORT_IF_NULL(filter->options);
-        filter->options[0] = MXS_STRDUP_A(option);
-        filter->options[1] = NULL;
-    }
-    else
-    {
-        for (i = 0; filter->options[i]; i++)
-        {
-            ;
-        }
-
-        filter->options = (char **)MXS_REALLOC(filter->options, (i + 2) * sizeof(char *));
-        MXS_ABORT_IF_NULL(filter->options);
-        filter->options[i] = MXS_STRDUP_A(option);
-        MXS_ABORT_IF_NULL(filter->options[i]);
-        filter->options[i + 1] = NULL;
-    }
-    spinlock_release(&filter->spin);
-}
-
 /**
  * Add a router parameter to a service
  *
@@ -386,7 +319,6 @@ bool filter_load(MXS_FILTER_DEF* filter)
                 ss_dassert(!filter->filter);
 
                 if ((filter->filter = (filter->obj->createInstance)(filter->name,
-                                                                    filter->options,
                                                                     filter->parameters)))
                 {
                     rval = true;
@@ -479,18 +411,6 @@ json_t* filter_parameters_to_json(const MXS_FILTER_DEF* filter)
 {
     json_t* rval = json_object();
 
-    if (filter->options)
-    {
-        json_t* arr = json_array();
-
-        for (int i = 0; filter->options && filter->options[i]; i++)
-        {
-            json_array_append_new(arr, json_string(filter->options[i]));
-        }
-
-        json_object_set_new(rval, "options", arr);
-    }
-
     /** Add custom module parameters */
     const MXS_MODULE* mod = get_module(filter->module, MODULE_FILTER);
     config_add_module_params_json(mod, filter->parameters, config_filter_params, rval);
diff --git a/server/core/internal/filter.h b/server/core/internal/filter.h
index 28dbcaed1..8b1aaabed 100644
--- a/server/core/internal/filter.h
+++ b/server/core/internal/filter.h
@@ -29,7 +29,6 @@ struct mxs_filter_def
 {
     char *name;                   /**< The Filter name */
     char *module;                 /**< The module to load */
-    char **options;               /**< The options set for this filter */
     MXS_CONFIG_PARAMETER *parameters; /**< The filter parameters */
     MXS_FILTER* filter;           /**< The runtime filter */
     MXS_FILTER_OBJECT *obj;       /**< The "MODULE_OBJECT" for the filter */
@@ -37,7 +36,6 @@ struct mxs_filter_def
     struct mxs_filter_def *next;  /**< Next filter in the chain of all filters */
 };
 
-void filter_add_option(MXS_FILTER_DEF *filter_def, const char *option);
 void filter_add_parameter(MXS_FILTER_DEF *filter_def, const char *name, const char *value);
 MXS_FILTER_DEF *filter_alloc(const char *name, const char *module_name);
 MXS_DOWNSTREAM *filter_apply(MXS_FILTER_DEF *filter_def, MXS_SESSION *session, MXS_DOWNSTREAM *downstream);
diff --git a/server/core/test/test_filter.cc b/server/core/test/test_filter.cc
index 3b1ead9e9..d27c1c251 100644
--- a/server/core/test/test_filter.cc
+++ b/server/core/test/test_filter.cc
@@ -83,9 +83,6 @@ test2()
         fprintf(stderr, "filter_alloc: test 1 failed.\n");
         return 1;
     }
-    filter_add_option(f1, "option1");
-    filter_add_option(f1, "option2");
-    filter_add_option(f1, "option3");
     filter_add_parameter(f1, "name1", "value1");
     filter_add_parameter(f1, "name2", "value2");
     filter_add_parameter(f1, "name3", "value3");
diff --git a/server/modules/filter/binlogfilter/binlogfilter.cc b/server/modules/filter/binlogfilter/binlogfilter.cc
index 2f8d0565c..b47d2f6e2 100644
--- a/server/modules/filter/binlogfilter/binlogfilter.cc
+++ b/server/modules/filter/binlogfilter/binlogfilter.cc
@@ -56,7 +56,6 @@ BinlogFilter::~BinlogFilter()
 
 // static: filter create routine
 BinlogFilter* BinlogFilter::create(const char* zName,
-                                   char** pzOptions,
                                    MXS_CONFIG_PARAMETER* pParams)
 {
     return new BinlogFilter(pParams);
diff --git a/server/modules/filter/binlogfilter/binlogfilter.hh b/server/modules/filter/binlogfilter/binlogfilter.hh
index fc95d0970..a9e63e0ec 100644
--- a/server/modules/filter/binlogfilter/binlogfilter.hh
+++ b/server/modules/filter/binlogfilter/binlogfilter.hh
@@ -49,7 +49,6 @@ public:
 
     // Creates a new filter instance
     static BinlogFilter* create(const char* zName,
-                                char** pzOptions,
                                 MXS_CONFIG_PARAMETER* ppParams);
 
     // Creates a new session for this filter
diff --git a/server/modules/filter/cache/cachefilter.cc b/server/modules/filter/cache/cachefilter.cc
index 9751b330e..31e16e0c5 100644
--- a/server/modules/filter/cache/cachefilter.cc
+++ b/server/modules/filter/cache/cachefilter.cc
@@ -273,7 +273,7 @@ CacheFilter::~CacheFilter()
 }
 
 // static
-CacheFilter* CacheFilter::create(const char* zName, char** pzOptions, MXS_CONFIG_PARAMETER* ppParams)
+CacheFilter* CacheFilter::create(const char* zName, MXS_CONFIG_PARAMETER* ppParams)
 {
     CacheFilter* pFilter = new CacheFilter;
 
@@ -281,7 +281,7 @@ CacheFilter* CacheFilter::create(const char* zName, char** pzOptions, MXS_CONFIG
     {
         Cache* pCache = NULL;
 
-        if (process_params(pzOptions, ppParams, pFilter->m_config))
+        if (process_params(ppParams, pFilter->m_config))
         {
             switch (pFilter->m_config.thread_model)
             {
@@ -338,7 +338,7 @@ uint64_t CacheFilter::getCapabilities()
 }
 
 // static
-bool CacheFilter::process_params(char **pzOptions, MXS_CONFIG_PARAMETER *ppParams, CACHE_CONFIG& config)
+bool CacheFilter::process_params(MXS_CONFIG_PARAMETER *ppParams, CACHE_CONFIG& config)
 {
     bool error = false;
 
diff --git a/server/modules/filter/cache/cachefilter.hh b/server/modules/filter/cache/cachefilter.hh
index 0c9ba0d76..a66c5ddf2 100644
--- a/server/modules/filter/cache/cachefilter.hh
+++ b/server/modules/filter/cache/cachefilter.hh
@@ -22,7 +22,7 @@ class CacheFilter : public maxscale::Filter<CacheFilter, CacheFilterSession>
 public:
     ~CacheFilter();
 
-    static CacheFilter* create(const char* zName, char** pzOptions, MXS_CONFIG_PARAMETER* ppParams);
+    static CacheFilter* create(const char* zName, MXS_CONFIG_PARAMETER* ppParams);
 
     Cache& cache()
     {
@@ -48,7 +48,7 @@ private:
     CacheFilter(const CacheFilter&);
     CacheFilter& operator = (const CacheFilter&);
 
-    static bool process_params(char **pzOptions, MXS_CONFIG_PARAMETER *ppParams, CACHE_CONFIG& config);
+    static bool process_params(MXS_CONFIG_PARAMETER *ppParams, CACHE_CONFIG& config);
 
 private:
     CACHE_CONFIG         m_config;
diff --git a/server/modules/filter/cache/test/test_cacheoptions.cc b/server/modules/filter/cache/test/test_cacheoptions.cc
index 629541022..9cc82ca0d 100644
--- a/server/modules/filter/cache/test/test_cacheoptions.cc
+++ b/server/modules/filter/cache/test/test_cacheoptions.cc
@@ -320,7 +320,7 @@ int test(FilterModule& filter_module, const TEST_CASE& tc)
     sParameters->set_value("cached_data", "shared");
     sParameters->set_value("selects", "verify_cacheable");
 
-    auto_ptr<FilterModule::Instance> sInstance = filter_module.createInstance("test", NULL, sParameters);
+    auto_ptr<FilterModule::Instance> sInstance = filter_module.createInstance("test", sParameters);
 
     if (sInstance.get())
     {
diff --git a/server/modules/filter/ccrfilter/ccrfilter.cc b/server/modules/filter/ccrfilter/ccrfilter.cc
index 3ad8f9eb9..2faee8370 100644
--- a/server/modules/filter/ccrfilter/ccrfilter.cc
+++ b/server/modules/filter/ccrfilter/ccrfilter.cc
@@ -51,7 +51,7 @@
  * @endverbatim
  */
 
-static  MXS_FILTER *createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params);
+static  MXS_FILTER *createInstance(const char *name, MXS_CONFIG_PARAMETER *params);
 static  MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
 static  void   closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
 static  void   freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
@@ -193,7 +193,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
  * @return The instance data for this new instance
  */
 static MXS_FILTER *
-createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
+createInstance(const char *name, MXS_CONFIG_PARAMETER *params)
 {
     CCR_INSTANCE *my_instance = static_cast<CCR_INSTANCE*>(MXS_CALLOC(1, sizeof(CCR_INSTANCE)));
 
diff --git a/server/modules/filter/comment/commentfilter.cc b/server/modules/filter/comment/commentfilter.cc
index 643f22d6d..b7a466da7 100644
--- a/server/modules/filter/comment/commentfilter.cc
+++ b/server/modules/filter/comment/commentfilter.cc
@@ -60,7 +60,7 @@ CommentFilter::~CommentFilter()
 }
 
 // static
-CommentFilter* CommentFilter::create(const char* zName, char** pzOptions, MXS_CONFIG_PARAMETER* pParams)
+CommentFilter* CommentFilter::create(const char* zName, MXS_CONFIG_PARAMETER* pParams)
 {
     return new CommentFilter(config_get_string(pParams, CN_INJECT));
 }
diff --git a/server/modules/filter/comment/commentfilter.hh b/server/modules/filter/comment/commentfilter.hh
index 22d704bf6..c673fe49e 100644
--- a/server/modules/filter/comment/commentfilter.hh
+++ b/server/modules/filter/comment/commentfilter.hh
@@ -27,7 +27,7 @@ public:
     ~CommentFilter();
 
     // Creates a new filter instance
-    static CommentFilter* create(const char* zName, char** pzOptions, MXS_CONFIG_PARAMETER* ppParams);
+    static CommentFilter* create(const char* zName, MXS_CONFIG_PARAMETER* ppParams);
 
     // Creates a new session for this filter
     CommentFilterSession* newSession(MXS_SESSION* pSession);
diff --git a/server/modules/filter/dbfwfilter/dbfwfilter.cc b/server/modules/filter/dbfwfilter/dbfwfilter.cc
index f018b9f45..70179518f 100644
--- a/server/modules/filter/dbfwfilter/dbfwfilter.cc
+++ b/server/modules/filter/dbfwfilter/dbfwfilter.cc
@@ -1198,7 +1198,7 @@ Dbfw::~Dbfw()
 
 }
 
-Dbfw* Dbfw::create(const char* zName, char** pzOptions, MXS_CONFIG_PARAMETER* pParams)
+Dbfw* Dbfw::create(const char* zName, MXS_CONFIG_PARAMETER* pParams)
 {
     Dbfw* rval = NULL;
     RuleList rules;
diff --git a/server/modules/filter/dbfwfilter/dbfwfilter.hh b/server/modules/filter/dbfwfilter/dbfwfilter.hh
index 359ff54dd..f7806dcbe 100644
--- a/server/modules/filter/dbfwfilter/dbfwfilter.hh
+++ b/server/modules/filter/dbfwfilter/dbfwfilter.hh
@@ -205,7 +205,7 @@ public:
      *
      * @return New instance or NULL on error
      */
-    static Dbfw* create(const char* zName, char** pzOptions, MXS_CONFIG_PARAMETER* ppParams);
+    static Dbfw* create(const char* zName, MXS_CONFIG_PARAMETER* ppParams);
 
     /**
      * Create a new filter session
diff --git a/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc b/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc
index eef5dd03f..d0a23c072 100644
--- a/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc
+++ b/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc
@@ -819,7 +819,7 @@ int test(FilterModule& filter_module, const FW_TEST& t)
     sParameters->set_value("action", zAction);
     sParameters->set_value("rules", file.name());
 
-    auto_ptr<FilterModule::Instance> sInstance = filter_module.createInstance("test", NULL, sParameters);
+    auto_ptr<FilterModule::Instance> sInstance = filter_module.createInstance("test", sParameters);
 
     if (sInstance.get())
     {
diff --git a/server/modules/filter/hintfilter/hintfilter.cc b/server/modules/filter/hintfilter/hintfilter.cc
index 628a3b639..705d0d1a4 100644
--- a/server/modules/filter/hintfilter/hintfilter.cc
+++ b/server/modules/filter/hintfilter/hintfilter.cc
@@ -26,7 +26,7 @@
  *
  */
 
-static MXS_FILTER *createInstance(const char* name, char **options, MXS_CONFIG_PARAMETER *params);
+static MXS_FILTER *createInstance(const char* name, MXS_CONFIG_PARAMETER *params);
 static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
 static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
 static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
@@ -99,7 +99,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
  * @return The instance data for this new instance
  */
 static MXS_FILTER *
-createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
+createInstance(const char *name, MXS_CONFIG_PARAMETER *params)
 {
     HINT_INSTANCE *my_instance;
 
diff --git a/server/modules/filter/insertstream/insertstream.cc b/server/modules/filter/insertstream/insertstream.cc
index b42c05552..eecdf5e5d 100644
--- a/server/modules/filter/insertstream/insertstream.cc
+++ b/server/modules/filter/insertstream/insertstream.cc
@@ -30,7 +30,7 @@
  * @file datastream.c - Streaming of bulk inserts
  */
 
-static MXS_FILTER *createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER*params);
+static MXS_FILTER *createInstance(const char *name, MXS_CONFIG_PARAMETER*params);
 static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
 static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
 static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
@@ -163,7 +163,7 @@ static const char load_data_template[] = "LOAD DATA LOCAL INFILE 'maxscale.data'
  * @return The instance data for this new instance
  */
 static MXS_FILTER *
-createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
+createInstance(const char *name, MXS_CONFIG_PARAMETER *params)
 {
     DS_INSTANCE *my_instance;
 
diff --git a/server/modules/filter/luafilter/luafilter.cc b/server/modules/filter/luafilter/luafilter.cc
index a92b78fe0..e42384c81 100644
--- a/server/modules/filter/luafilter/luafilter.cc
+++ b/server/modules/filter/luafilter/luafilter.cc
@@ -55,7 +55,7 @@
 /*
  * The filter entry points
  */
-static MXS_FILTER *createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *);
+static MXS_FILTER *createInstance(const char *name, MXS_CONFIG_PARAMETER *);
 static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
 static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
 static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
@@ -246,7 +246,7 @@ void expose_functions(lua_State* state, GWBUF** active_buffer)
  * @return The instance data for this new instance
  */
 static MXS_FILTER *
-createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
+createInstance(const char *name, MXS_CONFIG_PARAMETER *params)
 {
     LUA_INSTANCE *my_instance;
 
diff --git a/server/modules/filter/masking/maskingfilter.cc b/server/modules/filter/masking/maskingfilter.cc
index 1987f63ae..15f221b1b 100644
--- a/server/modules/filter/masking/maskingfilter.cc
+++ b/server/modules/filter/masking/maskingfilter.cc
@@ -132,7 +132,7 @@ MaskingFilter::~MaskingFilter()
 }
 
 // static
-MaskingFilter* MaskingFilter::create(const char* zName, char** pzOptions, MXS_CONFIG_PARAMETER* pParams)
+MaskingFilter* MaskingFilter::create(const char* zName, MXS_CONFIG_PARAMETER* pParams)
 {
     MaskingFilter* pFilter = NULL;
 
diff --git a/server/modules/filter/masking/maskingfilter.hh b/server/modules/filter/masking/maskingfilter.hh
index e600321e7..fe598bfc6 100644
--- a/server/modules/filter/masking/maskingfilter.hh
+++ b/server/modules/filter/masking/maskingfilter.hh
@@ -29,7 +29,7 @@ public:
     typedef MaskingFilterConfig Config;
 
     ~MaskingFilter();
-    static MaskingFilter* create(const char* zName, char** pzOptions, MXS_CONFIG_PARAMETER* ppParams);
+    static MaskingFilter* create(const char* zName, MXS_CONFIG_PARAMETER* ppParams);
 
     MaskingFilterSession* newSession(MXS_SESSION* pSession);
 
diff --git a/server/modules/filter/maxrows/maxrows.cc b/server/modules/filter/maxrows/maxrows.cc
index 33aa0149a..fe613157b 100644
--- a/server/modules/filter/maxrows/maxrows.cc
+++ b/server/modules/filter/maxrows/maxrows.cc
@@ -37,9 +37,7 @@
 
 #include "maxrows.h"
 
-static MXS_FILTER *createInstance(const char *name,
-                                  char **options,
-                                  MXS_CONFIG_PARAMETER *);
+static MXS_FILTER *createInstance(const char *name, MXS_CONFIG_PARAMETER *);
 static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance,
                                       MXS_SESSION *session);
 static void    closeSession(MXS_FILTER *instance,
@@ -234,9 +232,7 @@ static int send_maxrows_reply_limit(MAXROWS_SESSION_DATA *csdata);
  *
  * @return The instance data for this new instance
  */
-static MXS_FILTER *createInstance(const char *name,
-                                  char **options,
-                                  MXS_CONFIG_PARAMETER *params)
+static MXS_FILTER *createInstance(const char *name, MXS_CONFIG_PARAMETER *params)
 {
     MAXROWS_INSTANCE *cinstance = static_cast<MAXROWS_INSTANCE*>(MXS_CALLOC(1, sizeof(MAXROWS_INSTANCE)));
 
diff --git a/server/modules/filter/mqfilter/mqfilter.cc b/server/modules/filter/mqfilter/mqfilter.cc
index 69c173a00..376ff58e1 100644
--- a/server/modules/filter/mqfilter/mqfilter.cc
+++ b/server/modules/filter/mqfilter/mqfilter.cc
@@ -85,7 +85,7 @@ static int hktask_id = 0;
 /*
  * The filter entry points
  */
-static MXS_FILTER *createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *);
+static MXS_FILTER *createInstance(const char *name, MXS_CONFIG_PARAMETER *);
 static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
 static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
 static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
@@ -526,7 +526,7 @@ char** parse_optstr(const char* str, const char* tok, int* szstore)
  * @return The instance data for this new instance
  */
 static MXS_FILTER *
-createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
+createInstance(const char *name, MXS_CONFIG_PARAMETER *params)
 {
     MQ_INSTANCE *my_instance = static_cast<MQ_INSTANCE*>(MXS_CALLOC(1, sizeof(MQ_INSTANCE)));
 
diff --git a/server/modules/filter/namedserverfilter/namedserverfilter.cc b/server/modules/filter/namedserverfilter/namedserverfilter.cc
index 249313512..0586b46e4 100644
--- a/server/modules/filter/namedserverfilter/namedserverfilter.cc
+++ b/server/modules/filter/namedserverfilter/namedserverfilter.cc
@@ -232,7 +232,7 @@ uint64_t RegexHintFilter::getCapabilities()
  * @return The new instance or null on error
  */
 RegexHintFilter*
-RegexHintFilter::create(const char* name, char** options, MXS_CONFIG_PARAMETER* params)
+RegexHintFilter::create(const char* name, MXS_CONFIG_PARAMETER* params)
 {
     bool error = false;
     SourceHost* source_host = NULL;
diff --git a/server/modules/filter/namedserverfilter/namedserverfilter.hh b/server/modules/filter/namedserverfilter/namedserverfilter.hh
index 520962593..a82c56b4e 100644
--- a/server/modules/filter/namedserverfilter/namedserverfilter.hh
+++ b/server/modules/filter/namedserverfilter/namedserverfilter.hh
@@ -54,8 +54,7 @@ public:
     RegexHintFilter(string user, SourceHost* source, const MappingArray& map,
                     int ovector_size);
     ~RegexHintFilter();
-    static RegexHintFilter* create(const char* zName, char** pzOptions,
-                                   MXS_CONFIG_PARAMETER* ppParams);
+    static RegexHintFilter* create(const char* zName,  MXS_CONFIG_PARAMETER* ppParams);
     RegexHintFSession* newSession(MXS_SESSION *session);
     void diagnostics(DCB* dcb);
     json_t* diagnostics_json() const;
diff --git a/server/modules/filter/nullfilter/nullfilter.cc b/server/modules/filter/nullfilter/nullfilter.cc
index fed390f93..8832a2d93 100644
--- a/server/modules/filter/nullfilter/nullfilter.cc
+++ b/server/modules/filter/nullfilter/nullfilter.cc
@@ -126,7 +126,7 @@ NullFilter::~NullFilter()
 }
 
 // static
-NullFilter* NullFilter::create(const char* zName, char**, MXS_CONFIG_PARAMETER* pParams)
+NullFilter* NullFilter::create(const char* zName, MXS_CONFIG_PARAMETER* pParams)
 {
     NullFilter* pFilter = NULL;
 
diff --git a/server/modules/filter/nullfilter/nullfilter.hh b/server/modules/filter/nullfilter/nullfilter.hh
index 733a499a9..72235eab7 100644
--- a/server/modules/filter/nullfilter/nullfilter.hh
+++ b/server/modules/filter/nullfilter/nullfilter.hh
@@ -20,7 +20,7 @@ class NullFilter : public maxscale::Filter<NullFilter, NullFilterSession>
 {
 public:
     ~NullFilter();
-    static NullFilter* create(const char* zName, char** pzOptions, MXS_CONFIG_PARAMETER* pParams);
+    static NullFilter* create(const char* zName, MXS_CONFIG_PARAMETER* pParams);
 
     NullFilterSession* newSession(MXS_SESSION* pSession);
 
diff --git a/server/modules/filter/qlafilter/qlafilter.cc b/server/modules/filter/qlafilter/qlafilter.cc
index a89b34f0c..e59c3a0d6 100644
--- a/server/modules/filter/qlafilter/qlafilter.cc
+++ b/server/modules/filter/qlafilter/qlafilter.cc
@@ -89,7 +89,7 @@ enum log_options
 };
 
 /* The filter entry points */
-static MXS_FILTER *createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *);
+static MXS_FILTER *createInstance(const char *name, MXS_CONFIG_PARAMETER *);
 static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
 static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
 static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
@@ -442,7 +442,7 @@ MXS_END_DECLS
  * @return The new filter instance, or NULL on error
  */
 static MXS_FILTER *
-createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
+createInstance(const char *name, MXS_CONFIG_PARAMETER *params)
 {
     bool error = false;
     QlaInstance* my_instance = NULL;
diff --git a/server/modules/filter/regexfilter/regexfilter.cc b/server/modules/filter/regexfilter/regexfilter.cc
index 3305aeab6..25bc26a1d 100644
--- a/server/modules/filter/regexfilter/regexfilter.cc
+++ b/server/modules/filter/regexfilter/regexfilter.cc
@@ -42,7 +42,7 @@
  * @endverbatim
  */
 
-static MXS_FILTER *createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params);
+static MXS_FILTER *createInstance(const char *name, MXS_CONFIG_PARAMETER *params);
 static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
 static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
 static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
@@ -188,7 +188,7 @@ void free_instance(REGEX_INSTANCE *instance)
  * @return The instance data for this new instance
  */
 static MXS_FILTER *
-createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
+createInstance(const char *name, MXS_CONFIG_PARAMETER *params)
 {
     REGEX_INSTANCE *my_instance = static_cast<REGEX_INSTANCE*>(MXS_CALLOC(1, sizeof(REGEX_INSTANCE)));
 
diff --git a/server/modules/filter/tee/tee.cc b/server/modules/filter/tee/tee.cc
index 8101a5b65..0b9494473 100644
--- a/server/modules/filter/tee/tee.cc
+++ b/server/modules/filter/tee/tee.cc
@@ -59,7 +59,7 @@ Tee::Tee(SERVICE* service, std::string user, std::string remote,
  *
  * @return The instance data for this new instance
  */
-Tee* Tee::create(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
+Tee* Tee::create(const char *name, MXS_CONFIG_PARAMETER *params)
 {
     SERVICE* service = config_get_service(params, "service");
     const char* source = config_get_string(params, "source");
diff --git a/server/modules/filter/tee/tee.hh b/server/modules/filter/tee/tee.hh
index 85f03e8ba..cb3058216 100644
--- a/server/modules/filter/tee/tee.hh
+++ b/server/modules/filter/tee/tee.hh
@@ -32,7 +32,7 @@ class Tee: public mxs::Filter<Tee, TeeSession>
     const Tee& operator=(const Tee&);
 public:
 
-    static Tee* create(const char* zName, char** pzOptions, MXS_CONFIG_PARAMETER* ppParams);
+    static Tee* create(const char* zName, MXS_CONFIG_PARAMETER* ppParams);
     TeeSession* newSession(MXS_SESSION* session);
     void diagnostics(DCB* pDcb);
     json_t* diagnostics_json() const;
diff --git a/server/modules/filter/test/filtermodule.cc b/server/modules/filter/test/filtermodule.cc
index 74f4416bf..1a1a12cda 100644
--- a/server/modules/filter/test/filtermodule.cc
+++ b/server/modules/filter/test/filtermodule.cc
@@ -27,12 +27,11 @@ namespace maxscale
 const char* FilterModule::zName = MODULE_FILTER;
 
 auto_ptr<FilterModule::Instance> FilterModule::createInstance(const char* zName,
-                                                              char** pzOptions,
                                                               MXS_CONFIG_PARAMETER* pParameters)
 {
     auto_ptr<Instance> sInstance;
 
-    MXS_FILTER* pFilter = m_pApi->createInstance(zName, pzOptions, pParameters);
+    MXS_FILTER* pFilter = m_pApi->createInstance(zName, pParameters);
 
     if (pFilter)
     {
@@ -43,10 +42,9 @@ auto_ptr<FilterModule::Instance> FilterModule::createInstance(const char* zName,
 }
 
 auto_ptr<FilterModule::Instance> FilterModule::createInstance(const char* zName,
-                                                              char** pzOptions,
                                                               std::auto_ptr<ConfigParameters> sParameters)
 {
-    return createInstance(zName, pzOptions, sParameters.get());
+    return createInstance(zName, sParameters.get());
 }
 
 //
diff --git a/server/modules/filter/test/maxscale/filtermodule.hh b/server/modules/filter/test/maxscale/filtermodule.hh
index 6349a48cc..f1dd2e048 100644
--- a/server/modules/filter/test/maxscale/filtermodule.hh
+++ b/server/modules/filter/test/maxscale/filtermodule.hh
@@ -137,11 +137,9 @@ public:
      * @return A new instance or NULL if creation failed.
      */
     std::auto_ptr<Instance> createInstance(const char* zName,
-                                           char** pzOptions,
                                            MXS_CONFIG_PARAMETER* pParameters);
 
     std::auto_ptr<Instance> createInstance(const char* zName,
-                                           char** pzOptions,
                                            std::auto_ptr<ConfigParameters> sParameters);
 
 private:
diff --git a/server/modules/filter/throttlefilter/throttlefilter.cc b/server/modules/filter/throttlefilter/throttlefilter.cc
index a0f046490..0a7551572 100644
--- a/server/modules/filter/throttlefilter/throttlefilter.cc
+++ b/server/modules/filter/throttlefilter/throttlefilter.cc
@@ -61,7 +61,7 @@ ThrottleFilter::ThrottleFilter(const ThrottleConfig &config) : m_config(config)
 {
 }
 
-ThrottleFilter * ThrottleFilter::create(const char* zName, char * * pzOptions, MXS_CONFIG_PARAMETER * pParams)
+ThrottleFilter * ThrottleFilter::create(const char* zName, MXS_CONFIG_PARAMETER * pParams)
 {
     int max_qps        = config_get_integer(pParams, MAX_QPS_CFG);
     int sample_msecs   = config_get_integer(pParams, SAMPLING_DURATION_CFG);
diff --git a/server/modules/filter/throttlefilter/throttlefilter.hh b/server/modules/filter/throttlefilter/throttlefilter.hh
index 590833a62..6e2333993 100644
--- a/server/modules/filter/throttlefilter/throttlefilter.hh
+++ b/server/modules/filter/throttlefilter/throttlefilter.hh
@@ -49,7 +49,7 @@ struct ThrottleConfig
 class ThrottleFilter : public maxscale::Filter<ThrottleFilter, ThrottleSession>
 {
 public:
-    static ThrottleFilter* create(const char* zName, char** pzOptions, MXS_CONFIG_PARAMETER* pParams);
+    static ThrottleFilter* create(const char* zName, MXS_CONFIG_PARAMETER* pParams);
     ThrottleFilter(const ThrottleFilter&) = delete;
     ThrottleFilter& operator = (const ThrottleFilter&) = delete;
 
diff --git a/server/modules/filter/topfilter/topfilter.cc b/server/modules/filter/topfilter/topfilter.cc
index aac3dd877..e4c988345 100644
--- a/server/modules/filter/topfilter/topfilter.cc
+++ b/server/modules/filter/topfilter/topfilter.cc
@@ -50,7 +50,7 @@
 /*
  * The filter entry points
  */
-static MXS_FILTER *createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *);
+static MXS_FILTER *createInstance(const char *name, MXS_CONFIG_PARAMETER *);
 static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
 static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
 static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
@@ -202,7 +202,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
  * @return The instance data for this new instance
  */
 static MXS_FILTER *
-createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
+createInstance(const char *name, MXS_CONFIG_PARAMETER *params)
 {
     TOPN_INSTANCE *my_instance = (TOPN_INSTANCE*)MXS_MALLOC(sizeof(TOPN_INSTANCE));
 
diff --git a/server/modules/filter/tpmfilter/tpmfilter.cc b/server/modules/filter/tpmfilter/tpmfilter.cc
index fc4db341b..057c11103 100644
--- a/server/modules/filter/tpmfilter/tpmfilter.cc
+++ b/server/modules/filter/tpmfilter/tpmfilter.cc
@@ -78,7 +78,7 @@ static const int default_sql_size = 4 * 1024;
 /*
  * The filter entry points
  */
-static  MXS_FILTER  *createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *);
+static  MXS_FILTER  *createInstance(const char *name, MXS_CONFIG_PARAMETER *);
 static  MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
 static  void    closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
 static  void    freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
@@ -208,7 +208,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
  * @return The instance data for this new instance
  */
 static MXS_FILTER *
-createInstance(const char *name, char **options, MXS_CONFIG_PARAMETER *params)
+createInstance(const char *name, MXS_CONFIG_PARAMETER *params)
 {
     TPM_INSTANCE *my_instance = static_cast<TPM_INSTANCE*>(MXS_CALLOC(1, sizeof(TPM_INSTANCE)));