diff --git a/io_shape_mdd/__init__.py b/io_shape_mdd/__init__.py
index d3e4c58b40ae723d61654d0e7d06374ce90787e6..beef8d4c22cc026d9d91c7fd4e6cde5691e4d8d4 100644
--- a/io_shape_mdd/__init__.py
+++ b/io_shape_mdd/__init__.py
@@ -82,7 +82,7 @@ class ImportMDD(bpy.types.Operator, ImportHelper):
         keywords = self.as_keywords(ignore=("filter_glob",))
 
         from . import import_mdd
-        return import_mdd.load(self, context, **keywords)
+        return import_mdd.load(context, **keywords)
 
 
 class ExportMDD(bpy.types.Operator, ExportHelper):
@@ -138,7 +138,7 @@ class ExportMDD(bpy.types.Operator, ExportHelper):
         keywords = self.as_keywords(ignore=("check_existing", "filter_glob"))
 
         from . import export_mdd
-        return export_mdd.save(self, context, **keywords)
+        return export_mdd.save(context, **keywords)
 
 
 def menu_func_import(self, context):
diff --git a/io_shape_mdd/export_mdd.py b/io_shape_mdd/export_mdd.py
index aaa2f6a92a446463950dd567bc9d3bab3df96db3..e7fda3ac2e9cbd6dcb95daa5b24c9652947e85e2 100644
--- a/io_shape_mdd/export_mdd.py
+++ b/io_shape_mdd/export_mdd.py
@@ -51,7 +51,7 @@ def check_vertcount(mesh, vertcount):
         raise Exception('Error, number of verts has changed during animation, cannot export')
 
 
-def save(operator, context, filepath="", frame_start=1, frame_end=300, fps=25.0):
+def save(context, filepath="", frame_start=1, frame_end=300, fps=25.0):
     """
     Blender.Window.WaitCursor(1)
 
diff --git a/io_shape_mdd/import_mdd.py b/io_shape_mdd/import_mdd.py
index 8caedccde618c1d99de4ee3b2a80bc4dd211ad5b..3a2484860b7f393498f3f9417bd2f3a414d4afa7 100644
--- a/io_shape_mdd/import_mdd.py
+++ b/io_shape_mdd/import_mdd.py
@@ -80,7 +80,7 @@ def obj_update_frame(file, scene, obj, start, fr, step):
     obj.data.update()
 
 
-def load(operator, context, filepath, frame_start=0, frame_step=1):
+def load(context, filepath, frame_start=0, frame_step=1):
 
     scene = context.scene
     obj = context.object