diff --git a/wrap/Method.cpp b/wrap/Method.cpp
index 0bded5f60..66707d7e4 100644
--- a/wrap/Method.cpp
+++ b/wrap/Method.cpp
@@ -53,13 +53,12 @@ void Method::proxy_header(FileWriter& proxyFile) const {
 /* ************************************************************************* */
 string Method::wrapper_call(FileWriter& wrapperFile, Str cppClassName,
     Str matlabUniqueName, const ArgumentList& args,
-    const ReturnValue& returnVal, const TypeAttributesTable& typeAttributes,
     const Qualified& instName) const {
   // check arguments
   // extra argument obj -> nargin-1 is passed !
   // example: checkArguments("equals",nargout,nargin-1,2);
-  wrapperFile.oss << "  checkArguments(\"" << matlabName() << "\",nargout,nargin-1,"
-      << args.size() << ");\n";
+  wrapperFile.oss << "  checkArguments(\"" << matlabName()
+      << "\",nargout,nargin-1," << args.size() << ");\n";
 
   // get class pointer
   // example: shared_ptr<Test> = unwrap_shared_ptr< Test >(in[0], "Test");
diff --git a/wrap/Method.h b/wrap/Method.h
index e0e19c656..160a0f454 100644
--- a/wrap/Method.h
+++ b/wrap/Method.h
@@ -56,7 +56,6 @@ private:
 
   virtual std::string wrapper_call(FileWriter& wrapperFile, Str cppClassName,
       Str matlabUniqueName, const ArgumentList& args,
-      const ReturnValue& returnVal, const TypeAttributesTable& typeAttributes,
       const Qualified& instName) const;
 };
 
diff --git a/wrap/MethodBase.cpp b/wrap/MethodBase.cpp
index 6f0d4d82d..a63b95b90 100644
--- a/wrap/MethodBase.cpp
+++ b/wrap/MethodBase.cpp
@@ -121,7 +121,7 @@ string MethodBase::wrapper_fragment(FileWriter& wrapperFile, Str cppClassName,
   // for static methods: cppClassName::staticMethod<TemplateVal>
   // for instance methods: obj->instanceMethod<TemplateVal>
   string expanded = wrapper_call(wrapperFile, cppClassName, matlabUniqueName,
-      args, returnVal, typeAttributes, instName);
+      args, instName);
 
   expanded += ("(" + args.names() + ")");
   if (returnVal.type1.name != "void")
@@ -136,10 +136,9 @@ string MethodBase::wrapper_fragment(FileWriter& wrapperFile, Str cppClassName,
 }
 
 /* ************************************************************************* */
-void MethodBase::python_wrapper(FileWriter& wrapperFile,
-    Str className) const {
-  wrapperFile.oss << "  .def(\"" << name_ << "\", &" << className << "::" << name_
-      << ");\n";
+void MethodBase::python_wrapper(FileWriter& wrapperFile, Str className) const {
+  wrapperFile.oss << "  .def(\"" << name_ << "\", &" << className << "::"
+      << name_ << ");\n";
 }
 
 /* ************************************************************************* */
diff --git a/wrap/MethodBase.h b/wrap/MethodBase.h
index d14e632d3..da50b8124 100644
--- a/wrap/MethodBase.h
+++ b/wrap/MethodBase.h
@@ -64,7 +64,6 @@ protected:
 
   virtual std::string wrapper_call(FileWriter& wrapperFile, Str cppClassName,
       Str matlabUniqueName, const ArgumentList& args,
-      const ReturnValue& returnVal, const TypeAttributesTable& typeAttributes,
       const Qualified& instName) const = 0;
 };
 
diff --git a/wrap/StaticMethod.cpp b/wrap/StaticMethod.cpp
index 9ecc1ca56..6a2917eb2 100644
--- a/wrap/StaticMethod.cpp
+++ b/wrap/StaticMethod.cpp
@@ -39,7 +39,6 @@ void StaticMethod::proxy_header(FileWriter& proxyFile) const {
 /* ************************************************************************* */
 string StaticMethod::wrapper_call(FileWriter& wrapperFile, Str cppClassName,
     Str matlabUniqueName, const ArgumentList& args,
-    const ReturnValue& returnVal, const TypeAttributesTable& typeAttributes,
     const Qualified& instName) const {
   // check arguments
   // NOTE: for static functions, there is no object passed
diff --git a/wrap/StaticMethod.h b/wrap/StaticMethod.h
index 73cb66c65..cc8401cad 100644
--- a/wrap/StaticMethod.h
+++ b/wrap/StaticMethod.h
@@ -44,7 +44,6 @@ protected:
 
   virtual std::string wrapper_call(FileWriter& wrapperFile, Str cppClassName,
       Str matlabUniqueName, const ArgumentList& args,
-      const ReturnValue& returnVal, const TypeAttributesTable& typeAttributes,
       const Qualified& instName) const;
 };