diff --git a/mace/core/mace.cc b/mace/core/mace.cc
index 2a49c325912a094a76b89d3e3172f705c720629e..b2a084548d334e53329cc5a4f6d4264771ea9ac0 100644
--- a/mace/core/mace.cc
+++ b/mace/core/mace.cc
@@ -24,8 +24,6 @@
 #include "mace/core/types.h"
 #include "mace/public/mace.h"
 
-
-
 #ifdef MACE_ENABLE_OPENCL
 #include "mace/core/runtime/opencl/opencl_runtime.h"
 #endif  // MACE_ENABLE_OPENCL
diff --git a/mace/python/tools/model.jinja2 b/mace/python/tools/model.jinja2
index ba2ca7462a1d33d5c6b4dc675454680d36d32fe9..4aaf6e47b5e656668456aaf837cdc3ee2f7d1164 100644
--- a/mace/python/tools/model.jinja2
+++ b/mace/python/tools/model.jinja2
@@ -24,7 +24,6 @@
 #include "mace/utils/logging.h"
 
 namespace mace {
-{% if model_type == 'source' %}
 namespace {{tag}} {
 
 {% for i in range(net.tensors|length) %}
@@ -133,7 +132,6 @@ void CreateMemoryArena(mace::MemoryArena *mem_arena) {
 
 
 }  // namespace
-{% endif %}
 
 namespace {{tag}} {
 
diff --git a/mace/python/tools/model_header.jinja2 b/mace/python/tools/model_header.jinja2
index 98f956d12cdd34c570d38ef4fb8017c99759b3da..28b1b54563943509e3b4d2ec2ef0c8a90bc87e9c 100644
--- a/mace/python/tools/model_header.jinja2
+++ b/mace/python/tools/model_header.jinja2
@@ -24,11 +24,12 @@
 namespace mace {
 namespace {{tag}} {
 
-const unsigned char *LoadModelData(const char *model_data_file);
+
+const unsigned char *LoadModelData(const std::string &model_data_file);
 
 void UnloadModelData(const unsigned char *model_data);
 
-NetDef CreateNet();
+const std::shared_ptr<NetDef> CreateNet();
 
 const std::string ModelName();
 
diff --git a/mace/python/tools/source_converter_lib.py b/mace/python/tools/source_converter_lib.py
index 93dcba0e41352459416448517f56154079b31ea7..0fbf32fb31b0fc3f7ad8aa6dd7f3544c6dc78916 100644
--- a/mace/python/tools/source_converter_lib.py
+++ b/mace/python/tools/source_converter_lib.py
@@ -89,8 +89,7 @@ def convert_to_source(net_def, model_checksum, weight_checksum, template_dir,
             embed_model_data=embed_model_data,
             winograd_conv=winograd_conv,
             checksum=checksum,
-            build_time=build_time,
-            model_type=model_load_type)
+            build_time=build_time)
         with open(output, "wb") as f:
             f.write(source)