Imported Upstream version 0.4upstream/0.4

206 files changed, 220 insertions, 8574 deletions

diff --git a/compiler/tflchef/tflite/CMakeLists.txt b/compiler/tflchef/tflite/CMakeLists.txt
index 83127cb3e..477c70c4c 100644
--- a/compiler/tflchef/tflite/CMakeLists.txt
+++ b/compiler/tflchef/tflite/CMakeLists.txt
@@ -4,7 +4,6 @@ add_library(tflchef_tflite STATIC ${SOURCES})
 target_include_directories(tflchef_tflite PUBLIC include)
 target_include_directories(tflchef_tflite PRIVATE src)
 target_link_libraries(tflchef_tflite tflchef_proto)
-target_link_libraries(tflchef_tflite mio_tflite)
+target_link_libraries(tflchef_tflite tflchef_flatbuffer)
 target_link_libraries(tflchef_tflite stdex)
 target_link_libraries(tflchef_tflite cwrap)
-target_link_libraries(tflchef_tflite souschef)
diff --git a/compiler/tflchef/tflite/src/FillerHelper.h b/compiler/tflchef/tflite/include/tflchef/RawModel.h
index 053a5c18a..6979f65fd 100644
--- a/compiler/tflchef/tflite/src/FillerHelper.h
+++ b/compiler/tflchef/tflite/include/tflchef/RawModel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +14,28 @@
  * limitations under the License.
  */
 
-#ifndef __FILLER_HELPER_H__
-#define __FILLER_HELPER_H__
+#ifndef __RAW_MODEL_H__
+#define __RAW_MODEL_H__
 
-#include "TFliteImport.h"
-
-#include <mio/tflite/schema_generated.h>
+#include "tflite_generated.h"
 
 namespace tflchef
 {
 
-void fill_tensor_to_import(int32_t idx, TFliteImport *import);
+struct RawModel
+{
+  virtual ~RawModel() = default;
+
+  virtual const ::tflite::Model *model(void) const = 0;
+};
+
+/**
+ * @brief Load TensorFlow Lite model (as a RawModel) from a given path
+ *
+ * @note May return a nullptr
+ */
+std::unique_ptr<RawModel> load_tflite(const std::string &path);
 
 } // namespace tflchef
 
-#endif // __FILLER_HELPER_H__
+#endif // __RAW_MODEL_H__
diff --git a/compiler/tflchef/tflite/include/tflchef/RecipeChef.h b/compiler/tflchef/tflite/include/tflchef/RecipeChef.h
index 2d292c3d5..98f9f1f82 100644
--- a/compiler/tflchef/tflite/include/tflchef/RecipeChef.h
+++ b/compiler/tflchef/tflite/include/tflchef/RecipeChef.h
@@ -17,7 +17,7 @@
 #ifndef __RECIPE_CHEF_H__
 #define __RECIPE_CHEF_H__
 
-#include <mio/tflite/schema_generated.h>
+#include <tflite_generated.h>
 #include <tflchef.pb.h>
 
 #include <memory>
diff --git a/compiler/tflchef/tflite/src/Convert.cpp b/compiler/tflchef/tflite/src/Convert.cpp
index 29276ff94..b7a93cb57 100644
--- a/compiler/tflchef/tflite/src/Convert.cpp
+++ b/compiler/tflchef/tflite/src/Convert.cpp
@@ -27,15 +27,12 @@ tflchef::TensorType as_tflchef_type(const tflite::TensorType type)
       return tflchef::FLOAT32;
     case tflite::TensorType_INT32:
       return tflchef::INT32;
-    case tflite::TensorType_INT64:
-      return tflchef::INT64;
-    case tflite::TensorType_UINT8:
-      return tflchef::UINT8;
-    case tflite::TensorType_BOOL:
-      return tflchef::BOOL;
     // TODO handle other types
     // TensorType_FLOAT16
+    // TensorType_UINT8
+    // TensorType_INT64
     // TensorType_STRING
+    // TensorType_BOOL
     // TensorType_INT16
     // TensorType_COMPLEX64
     default:
@@ -51,14 +48,12 @@ tflchef::Activation as_tflchef_activation(const tflite::ActivationFunctionType t
       return tflchef::NONE;
     case tflite::ActivationFunctionType_RELU:
       return tflchef::RELU;
-    case tflite::ActivationFunctionType_RELU_N1_TO_1:
-      return tflchef::RELU_N1_TO_1;
     case tflite::ActivationFunctionType_RELU6:
       return tflchef::RELU6;
-    case tflite::ActivationFunctionType_TANH:
-      return tflchef::TANH;
-    case tflite::ActivationFunctionType_SIGN_BIT:
-      return tflchef::SIGN_BIT;
+    // TODO handle other types
+    // ActivationFunctionType_RELU_N1_TO_1
+    // ActivationFunctionType_TANH
+    // ActivationFunctionType_SIGN_BIT
     default:
       throw std::runtime_error{"unsupported activation type"};
   }
@@ -77,47 +72,4 @@ tflchef::Padding as_tflchef_padding(const tflite::Padding padding)
   }
 }
 
-tflchef::MirrorPadMode as_tflchef_mirrorpadmode(const tflite::MirrorPadMode mode)
-{
-  switch (mode)
-  {
-    case tflite::MirrorPadMode_REFLECT:
-      return tflchef::REFLECT;
-    case tflite::MirrorPadMode_SYMMETRIC:
-      return tflchef::SYMMETRIC;
-    default:
-      throw std::runtime_error{"Unknown mirrorpad mode"};
-  }
-}
-
-tflchef::DimensionType as_tflchef_sparse_dim_type(const tflite::DimensionType type)
-{
-  switch (type)
-  {
-    case tflite::DimensionType_DENSE:
-      return tflchef::DimensionType::DENSE;
-    case tflite::DimensionType_SPARSE_CSR:
-      return tflchef::DimensionType::SPARSE_CSR;
-    default:
-      throw std::runtime_error("unsupported sparse dimension type");
-  }
-}
-
-tflchef::SparseIndexVecType as_tflchef_sparse_idx_vec_type(const tflite::SparseIndexVector type)
-{
-  switch (type)
-  {
-    case tflite::SparseIndexVector_NONE:
-      return tflchef::SparseIndexVecType::SparseIdxVecType_NONE;
-    case tflite::SparseIndexVector_Int32Vector:
-      return tflchef::SparseIndexVecType::INT32VEC;
-    case tflite::SparseIndexVector_Uint16Vector:
-      return tflchef::SparseIndexVecType::UINT16VEC;
-    case tflite::SparseIndexVector_Uint8Vector:
-      return tflchef::SparseIndexVecType::UINT8VEC;
-    default:
-      throw std::runtime_error("unsupported sparse index vector type");
-  }
-}
-
 } // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Convert.h b/compiler/tflchef/tflite/src/Convert.h
index cf0c61550..4973da111 100644
--- a/compiler/tflchef/tflite/src/Convert.h
+++ b/compiler/tflchef/tflite/src/Convert.h
@@ -17,7 +17,7 @@
 #ifndef __CONVERT_H__
 #define __CONVERT_H__
 
-#include <mio/tflite/schema_generated.h>
+#include <tflite_generated.h>
 
 #include <tflchef.pb.h>
 
@@ -27,22 +27,6 @@ namespace tflchef
 tflchef::TensorType as_tflchef_type(const tflite::TensorType type);
 tflchef::Activation as_tflchef_activation(const tflite::ActivationFunctionType type);
 tflchef::Padding as_tflchef_padding(const tflite::Padding padding);
-tflchef::MirrorPadMode as_tflchef_mirrorpadmode(const tflite::MirrorPadMode mode);
-tflchef::DimensionType as_tflchef_sparse_dim_type(const tflite::DimensionType type);
-tflchef::SparseIndexVecType as_tflchef_sparse_idx_vec_type(const tflite::SparseIndexVector type);
-
-/**
- * @brief extract buffer data to std::vector<DT>
- */
-template <typename DT> std::vector<DT> extract_buffer(const tflite::Buffer *buffer)
-{
-  assert(buffer->data() != nullptr);
-  auto buffer_length = buffer->data()->size();
-  auto num_elements = buffer_length / sizeof(DT);
-  std::vector<DT> result(num_elements);
-  std::memcpy(result.data(), buffer->data()->data(), buffer_length);
-  return result;
-}
 
 template <typename T> std::vector<T> as_index_vector(const flatbuffers::Vector<T> *flat_array)
 {
diff --git a/compiler/tflchef/tflite/src/FillerHelper.cpp b/compiler/tflchef/tflite/src/FillerHelper.cpp
deleted file mode 100644
index cf96d2e8c..000000000
--- a/compiler/tflchef/tflite/src/FillerHelper.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "FillerHelper.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void fill_tensor_to_import(int32_t idx, TFliteImport *import)
-{
-  const tflite::Tensor *tensor = import->tensors()->Get(idx);
-  if (tensor != nullptr)
-  {
-    if (tensor->type() == tflite::TensorType::TensorType_INT32)
-    {
-      const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-      if (buffer && buffer->data())
-      {
-        auto vec = extract_buffer<int32_t>(buffer);
-        import->set_tensor_filler(idx, vec);
-      }
-    }
-    else if (tensor->type() == tflite::TensorType::TensorType_FLOAT32)
-    {
-      const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-      if (buffer && buffer->data())
-      {
-        auto vec = extract_buffer<float>(buffer);
-        import->set_tensor_filler(idx, vec);
-      }
-    }
-  }
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Abs.cpp b/compiler/tflchef/tflite/src/Op/Abs.cpp
deleted file mode 100644
index 7d769e344..000000000
--- a/compiler/tflchef/tflite/src/Op/Abs.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Abs.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpAbs::filler(const tflite::Operator *op, TFliteImport *import,
-                         tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpAbs::build(const tflite::Operator *op, TFliteImport *import,
-                                       tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Abs");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Abs.h b/compiler/tflchef/tflite/src/Op/Abs.h
deleted file mode 100644
index d99b0d593..000000000
--- a/compiler/tflchef/tflite/src/Op/Abs.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_ABS_H__
-#define __TFLITE_OP_ABS_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for abs
- */
-class TFliteOpAbs : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_ABS_H__
diff --git a/compiler/tflchef/tflite/src/Op/Add.cpp b/compiler/tflchef/tflite/src/Op/Add.cpp
deleted file mode 100644
index 3e880a63b..000000000
--- a/compiler/tflchef/tflite/src/Op/Add.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Add.h"
-
-#include "Convert.h"
-#include "FillerHelper.h"
-
-namespace tflchef
-{
-
-void TFliteOpAdd::filler(const tflite::Operator *op, TFliteImport *import,
-                         tflchef::ModelRecipe *model_recipe) const
-{
-  // Add may have constant input
-
-  const std::vector<int32_t> &inputs = as_index_vector(op->inputs());
-  assert(inputs.size() == 2);
-
-  fill_tensor_to_import(inputs[0], import);
-  fill_tensor_to_import(inputs[1], import);
-}
-
-tflchef::Operation *TFliteOpAdd::build(const tflite::Operator *op, TFliteImport *import,
-                                       tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_AddOptions();
-  assert(op_params != nullptr);
-
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Add");
-
-  auto op_options = operation->mutable_add_options();
-
-  op_options->set_activation(as_tflchef_activation(op_params->fused_activation_function()));
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Add.h b/compiler/tflchef/tflite/src/Op/Add.h
deleted file mode 100644
index 49d945f8b..000000000
--- a/compiler/tflchef/tflite/src/Op/Add.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_ADD_H__
-#define __TFLITE_OP_ADD_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for add
- */
-class TFliteOpAdd : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_ADD_H__
diff --git a/compiler/tflchef/tflite/src/Op/AddN.cpp b/compiler/tflchef/tflite/src/Op/AddN.cpp
deleted file mode 100644
index aeb3803ab..000000000
--- a/compiler/tflchef/tflite/src/Op/AddN.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "AddN.h"
-
-#include "Convert.h"
-#include "FillerHelper.h"
-
-namespace tflchef
-{
-
-void TFliteOpAddN::filler(const tflite::Operator *op, TFliteImport *import,
-                          tflchef::ModelRecipe *model_recipe) const
-{
-  // AddN may have constant input
-
-  const std::vector<int32_t> &inputs = as_index_vector(op->inputs());
-
-  for (uint32_t idx = 0; idx < inputs.size(); ++idx)
-    fill_tensor_to_import(inputs[idx], import);
-}
-
-tflchef::Operation *TFliteOpAddN::build(const tflite::Operator *op, TFliteImport *import,
-                                        tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("AddN");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/AddN.h b/compiler/tflchef/tflite/src/Op/AddN.h
deleted file mode 100644
index 4387aa06a..000000000
--- a/compiler/tflchef/tflite/src/Op/AddN.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_ADD_N_H__
-#define __TFLITE_OP_ADD_N_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for AddN
- */
-class TFliteOpAddN : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_ADD_N_H__
diff --git a/compiler/tflchef/tflite/src/Op/ArgMax.cpp b/compiler/tflchef/tflite/src/Op/ArgMax.cpp
deleted file mode 100644
index f4d1c5e66..000000000
--- a/compiler/tflchef/tflite/src/Op/ArgMax.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ArgMax.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpArgMax::filler(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const
-{
-  // filler for second input, argmax/dim
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *dim_tensor = import->tensors()->Get(inputs[1]);
-  assert(dim_tensor->type() == tflite::TensorType::TensorType_INT32);
-  const tflite::Buffer *buffer = import->buffers()->Get(dim_tensor->buffer());
-  auto vec = extract_buffer<int32_t>(buffer);
-  import->set_tensor_filler(inputs[1], vec);
-}
-
-tflchef::Operation *TFliteOpArgMax::build(const tflite::Operator *op, TFliteImport *import,
-                                          tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_ArgMaxOptions();
-  assert(op_params != nullptr);
-
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("ArgMax");
-
-  auto op_options = operation->mutable_argmax_options();
-
-  op_options->set_output_type(as_tflchef_type(op_params->output_type()));
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/ArgMax.h b/compiler/tflchef/tflite/src/Op/ArgMax.h
deleted file mode 100644
index 30068ecf2..000000000
--- a/compiler/tflchef/tflite/src/Op/ArgMax.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_ARGMAX_H__
-#define __TFLITE_OP_ARGMAX_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for ArgMax
- */
-class TFliteOpArgMax : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_ARGMAX_H__
diff --git a/compiler/tflchef/tflite/src/Op/ArgMin.cpp b/compiler/tflchef/tflite/src/Op/ArgMin.cpp
deleted file mode 100644
index faab0b830..000000000
--- a/compiler/tflchef/tflite/src/Op/ArgMin.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ArgMin.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpArgMin::filler(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const
-{
-  // filler for second input, argmin/dim
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *dim_tensor = import->tensors()->Get(inputs[1]);
-  assert(dim_tensor->type() == tflite::TensorType::TensorType_INT32);
-  const tflite::Buffer *buffer = import->buffers()->Get(dim_tensor->buffer());
-  auto vec = extract_buffer<int32_t>(buffer);
-  import->set_tensor_filler(inputs[1], vec);
-}
-
-tflchef::Operation *TFliteOpArgMin::build(const tflite::Operator *op, TFliteImport *import,
-                                          tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_ArgMinOptions();
-  assert(op_params != nullptr);
-
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("ArgMin");
-
-  auto op_options = operation->mutable_argmin_options();
-
-  op_options->set_output_type(as_tflchef_type(op_params->output_type()));
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/ArgMin.h b/compiler/tflchef/tflite/src/Op/ArgMin.h
deleted file mode 100644
index 83c643c1a..000000000
--- a/compiler/tflchef/tflite/src/Op/ArgMin.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_ARGMIN_H__
-#define __TFLITE_OP_ARGMIN_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for ArgMin
- */
-class TFliteOpArgMin : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_ARGMIN_H__
diff --git a/compiler/tflchef/tflite/src/Op/BatchMatMul.cpp b/compiler/tflchef/tflite/src/Op/BatchMatMul.cpp
deleted file mode 100644
index 598e58c94..000000000
--- a/compiler/tflchef/tflite/src/Op/BatchMatMul.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "BatchMatMul.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpBatchMatMul::filler(const tflite::Operator *op, TFliteImport *import,
-                                 tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpBatchMatMul::build(const tflite::Operator *op, TFliteImport *import,
-                                               tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("BatchMatMul");
-
-  auto op_options = operation->mutable_batch_matmul_options();
-
-  auto op_params = op->builtin_options_as_BatchMatMulOptions();
-  assert(op_params != nullptr);
-
-  op_options->set_adj_x(op_params->adj_x());
-  op_options->set_adj_y(op_params->adj_y());
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/BatchMatMul.h b/compiler/tflchef/tflite/src/Op/BatchMatMul.h
deleted file mode 100644
index 6eb4c6e68..000000000
--- a/compiler/tflchef/tflite/src/Op/BatchMatMul.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_BATCHMATMUL_H__
-#define __TFLITE_OP_BATCHMATMUL_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for BATCH_MATMUL
- */
-class TFliteOpBatchMatMul : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_BATCHMATMUL_H__
diff --git a/compiler/tflchef/tflite/src/Op/BatchToSpaceND.cpp b/compiler/tflchef/tflite/src/Op/BatchToSpaceND.cpp
deleted file mode 100644
index d5d9606d1..000000000
--- a/compiler/tflchef/tflite/src/Op/BatchToSpaceND.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "BatchToSpaceND.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpBatchToSpaceND::filler(const tflite::Operator *op, TFliteImport *import,
-                                    tflchef::ModelRecipe *model_recipe) const
-{
-  // filler for second, third input
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *tensor = import->tensors()->Get(inputs[1]);
-  assert(tensor->type() == tflite::TensorType::TensorType_INT32);
-  const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-  auto vec = extract_buffer<int32_t>(buffer);
-  import->set_tensor_filler(inputs[1], vec);
-
-  tensor = import->tensors()->Get(inputs[2]);
-  assert(tensor->type() == tflite::TensorType::TensorType_INT32);
-  buffer = import->buffers()->Get(tensor->buffer());
-  vec = extract_buffer<int32_t>(buffer);
-  import->set_tensor_filler(inputs[2], vec);
-}
-
-tflchef::Operation *TFliteOpBatchToSpaceND::build(const tflite::Operator *op, TFliteImport *import,
-                                                  tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("BatchToSpaceND");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/BatchToSpaceND.h b/compiler/tflchef/tflite/src/Op/BatchToSpaceND.h
deleted file mode 100644
index ae2114c97..000000000
--- a/compiler/tflchef/tflite/src/Op/BatchToSpaceND.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_BATCHTOSPACEND_H__
-#define __TFLITE_OP_BATCHTOSPACEND_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for BatchToSpaceND
- */
-class TFliteOpBatchToSpaceND : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_BATCHTOSPACEND_H__
diff --git a/compiler/tflchef/tflite/src/Op/Cast.cpp b/compiler/tflchef/tflite/src/Op/Cast.cpp
deleted file mode 100644
index 393bb4b35..000000000
--- a/compiler/tflchef/tflite/src/Op/Cast.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Cast.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpCast::filler(const tflite::Operator *op, TFliteImport *import,
-                          tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpCast::build(const tflite::Operator *op, TFliteImport *import,
-                                        tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_CastOptions();
-  assert(op_params != nullptr);
-
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Cast");
-
-  auto op_options = operation->mutable_cast_options();
-
-  op_options->set_in_data_type(as_tflchef_type(op_params->in_data_type()));
-  op_options->set_out_data_type(as_tflchef_type(op_params->out_data_type()));
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Cast.h b/compiler/tflchef/tflite/src/Op/Cast.h
deleted file mode 100644
index 29c126c93..000000000
--- a/compiler/tflchef/tflite/src/Op/Cast.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_CAST_H__
-#define __TFLITE_OP_CAST_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for CAST
- */
-class TFliteOpCast : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_CAST_H__
diff --git a/compiler/tflchef/tflite/src/Op/Ceil.cpp b/compiler/tflchef/tflite/src/Op/Ceil.cpp
deleted file mode 100644
index d3ef3adae..000000000
--- a/compiler/tflchef/tflite/src/Op/Ceil.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Ceil.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpCeil::filler(const tflite::Operator *, TFliteImport *, tflchef::ModelRecipe *) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpCeil::build(const tflite::Operator *, TFliteImport *,
-                                        tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Ceil");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Ceil.h b/compiler/tflchef/tflite/src/Op/Ceil.h
deleted file mode 100644
index 44df20778..000000000
--- a/compiler/tflchef/tflite/src/Op/Ceil.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_CEIL_H__
-#define __TFLITE_OP_CEIL_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for CEIL
- */
-class TFliteOpCeil : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_CEIL_H__
diff --git a/compiler/tflchef/tflite/src/Op/Conv2D.cpp b/compiler/tflchef/tflite/src/Op/Conv2D.cpp
index 57abd4649..5d48ee24f 100644
--- a/compiler/tflchef/tflite/src/Op/Conv2D.cpp
+++ b/compiler/tflchef/tflite/src/Op/Conv2D.cpp
@@ -50,8 +50,7 @@ tflchef::Operation *TFliteOpConv2D::build(const tflite::Operator *op, TFliteImpo
   op_options->set_stride_h(op_params->stride_h());
   op_options->set_stride_w(op_params->stride_w());
   op_options->set_padding(as_tflchef_padding(op_params->padding()));
-  op_options->set_dilation_w_factor(op_params->dilation_w_factor());
-  op_options->set_dilation_h_factor(op_params->dilation_h_factor());
+  // TODO support dilation
 
   return operation;
 }
diff --git a/compiler/tflchef/tflite/src/Op/Cos.cpp b/compiler/tflchef/tflite/src/Op/Cos.cpp
deleted file mode 100644
index 9f2c49d49..000000000
--- a/compiler/tflchef/tflite/src/Op/Cos.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Cos.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpCos::filler(const tflite::Operator *op, TFliteImport *import,
-                         tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpCos::build(const tflite::Operator *op, TFliteImport *import,
-                                       tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Cos");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Cos.h b/compiler/tflchef/tflite/src/Op/Cos.h
deleted file mode 100644
index 8f3dbe3a6..000000000
--- a/compiler/tflchef/tflite/src/Op/Cos.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_COS_H__
-#define __TFLITE_OP_COS_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Cos
- */
-class TFliteOpCos : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_COS_H__
diff --git a/compiler/tflchef/tflite/src/Op/DepthToSpace.cpp b/compiler/tflchef/tflite/src/Op/DepthToSpace.cpp
deleted file mode 100644
index 1a0917e8e..000000000
--- a/compiler/tflchef/tflite/src/Op/DepthToSpace.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "DepthToSpace.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpDepthToSpace::filler(const tflite::Operator *op, TFliteImport *import,
-                                  tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpDepthToSpace::build(const tflite::Operator *op, TFliteImport *import,
-                                                tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("DepthToSpace");
-
-  auto op_params = op->builtin_options_as_DepthToSpaceOptions();
-  assert(op_params != nullptr);
-
-  auto op_options = operation->mutable_depth_to_space_options();
-
-  op_options->set_block_size(op_params->block_size());
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/DepthToSpace.h b/compiler/tflchef/tflite/src/Op/DepthToSpace.h
deleted file mode 100644
index b5852ac89..000000000
--- a/compiler/tflchef/tflite/src/Op/DepthToSpace.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_DEPTHTOSPACE_H__
-#define __TFLITE_OP_DEPTHTOSPACE_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for DepthToSpace
- */
-class TFliteOpDepthToSpace : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_DEPTHTOSPACE_H__
diff --git a/compiler/tflchef/tflite/src/Op/DepthwiseConv2D.cpp b/compiler/tflchef/tflite/src/Op/DepthwiseConv2D.cpp
index 5fed3353a..b19f9330f 100644
--- a/compiler/tflchef/tflite/src/Op/DepthwiseConv2D.cpp
+++ b/compiler/tflchef/tflite/src/Op/DepthwiseConv2D.cpp
@@ -50,8 +50,9 @@ tflchef::Operation *TFliteOpDepthwiseConv2D::build(const tflite::Operator *op, T
   op_options->set_stride_h(op_params->stride_h());
   op_options->set_stride_w(op_params->stride_w());
   op_options->set_depth_multiplier(op_params->depth_multiplier());
-  op_options->set_dilation_w_factor(op_params->dilation_w_factor());
-  op_options->set_dilation_h_factor(op_params->dilation_h_factor());
+  // TODO support dilation
+  // op_params->dilation_w_factor()
+  // op_params->dilation_h_factor()
   op_options->set_padding(as_tflchef_padding(op_params->padding()));
 
   return operation;
diff --git a/compiler/tflchef/tflite/src/Op/Dequantize.cpp b/compiler/tflchef/tflite/src/Op/Dequantize.cpp
deleted file mode 100644
index 436a0db19..000000000
--- a/compiler/tflchef/tflite/src/Op/Dequantize.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Dequantize.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpDequantize::filler(const tflite::Operator *op, TFliteImport *import,
-                                tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpDequantize::build(const tflite::Operator *, TFliteImport *import,
-                                              tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Dequantize");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Dequantize.h b/compiler/tflchef/tflite/src/Op/Dequantize.h
deleted file mode 100644
index df1c7bbdb..000000000
--- a/compiler/tflchef/tflite/src/Op/Dequantize.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_DEQUANTIZE_H__
-#define __TFLITE_OP_DEQUANTIZE_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Dequantize
- */
-class TFliteOpDequantize : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_DEQUANTIZE_H__
diff --git a/compiler/tflchef/tflite/src/Op/ELU.cpp b/compiler/tflchef/tflite/src/Op/ELU.cpp
deleted file mode 100644
index cb4b61d66..000000000
--- a/compiler/tflchef/tflite/src/Op/ELU.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ELU.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpELU::filler(const tflite::Operator *op, TFliteImport *import,
-                         tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpELU::build(const tflite::Operator *, TFliteImport *import,
-                                       tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("ELU");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/ELU.h b/compiler/tflchef/tflite/src/Op/ELU.h
deleted file mode 100644
index 490c9fde4..000000000
--- a/compiler/tflchef/tflite/src/Op/ELU.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_ELU_H__
-#define __TFLITE_OP_ELU_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for ELU
- */
-class TFliteOpELU : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_ELU_H__
diff --git a/compiler/tflchef/tflite/src/Op/Equal.cpp b/compiler/tflchef/tflite/src/Op/Equal.cpp
deleted file mode 100644
index a51586228..000000000
--- a/compiler/tflchef/tflite/src/Op/Equal.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Equal.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpEqual::filler(const tflite::Operator *op, TFliteImport *import,
-                           tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpEqual::build(const tflite::Operator *op, TFliteImport *import,
-                                         tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Equal");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Equal.h b/compiler/tflchef/tflite/src/Op/Equal.h
deleted file mode 100644
index fd4b40001..000000000
--- a/compiler/tflchef/tflite/src/Op/Equal.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_EQUAL_H__
-#define __TFLITE_OP_EQUAL_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Equal
- */
-class TFliteOpEqual : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_EQUAL_H__
diff --git a/compiler/tflchef/tflite/src/Op/Exp.cpp b/compiler/tflchef/tflite/src/Op/Exp.cpp
deleted file mode 100644
index f715da6ef..000000000
--- a/compiler/tflchef/tflite/src/Op/Exp.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Exp.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpExp::filler(const tflite::Operator *op, TFliteImport *import,
-                         tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpExp::build(const tflite::Operator *op, TFliteImport *import,
-                                       tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Exp");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Exp.h b/compiler/tflchef/tflite/src/Op/Exp.h
deleted file mode 100644
index 5ff3ddc8b..000000000
--- a/compiler/tflchef/tflite/src/Op/Exp.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_EXP_H__
-#define __TFLITE_OP_EXP_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Exp
- */
-class TFliteOpExp : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_EXP_H__
diff --git a/compiler/tflchef/tflite/src/Op/ExpandDims.cpp b/compiler/tflchef/tflite/src/Op/ExpandDims.cpp
deleted file mode 100644
index e30e8dbcc..000000000
--- a/compiler/tflchef/tflite/src/Op/ExpandDims.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ExpandDims.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpExpandDims::filler(const tflite::Operator *op, TFliteImport *import,
-                                tflchef::ModelRecipe *model_recipe) const
-{
-  // Fill for axis input
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *tensor = import->tensors()->Get(inputs[1]);
-  assert(tensor->type() == tflite::TensorType::TensorType_INT32);
-  const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-  auto vec = extract_buffer<int32_t>(buffer);
-  import->set_tensor_filler(inputs[1], vec);
-}
-
-tflchef::Operation *TFliteOpExpandDims::build(const tflite::Operator *op, TFliteImport *import,
-                                              tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("ExpandDims");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/ExpandDims.h b/compiler/tflchef/tflite/src/Op/ExpandDims.h
deleted file mode 100644
index e2f3e4e50..000000000
--- a/compiler/tflchef/tflite/src/Op/ExpandDims.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_EXPAND_DIMS_H__
-#define __TFLITE_OP_EXPAND_DIMS_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for ExpandDims
- */
-class TFliteOpExpandDims : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_EXPAND_DIMS_H__
diff --git a/compiler/tflchef/tflite/src/Op/Fill.cpp b/compiler/tflchef/tflite/src/Op/Fill.cpp
deleted file mode 100644
index 08b695fd7..000000000
--- a/compiler/tflchef/tflite/src/Op/Fill.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Fill.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpFill::filler(const tflite::Operator *op, TFliteImport *import,
-                          tflchef::ModelRecipe *model_recipe) const
-{
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *dims_tensor = import->tensors()->Get(inputs[0]);
-  assert(dims_tensor->type() == tflite::TensorType::TensorType_INT32);
-  const tflite::Buffer *buffer = import->buffers()->Get(dims_tensor->buffer());
-  auto vec = extract_buffer<int32_t>(buffer);
-  import->set_tensor_filler(inputs[0], vec);
-}
-
-tflchef::Operation *TFliteOpFill::build(const tflite::Operator *op, TFliteImport *import,
-                                        tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-  operation->set_type("Fill");
-
-  // FillOptions are empty
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Fill.h b/compiler/tflchef/tflite/src/Op/Fill.h
deleted file mode 100644
index 4f46f628a..000000000
--- a/compiler/tflchef/tflite/src/Op/Fill.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_FILL_H__
-#define __TFLITE_OP_FILL_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Fill
- */
-class TFliteOpFill : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_FILL_H__
diff --git a/compiler/tflchef/tflite/src/Op/Floor.cpp b/compiler/tflchef/tflite/src/Op/Floor.cpp
deleted file mode 100644
index 373c69f71..000000000
--- a/compiler/tflchef/tflite/src/Op/Floor.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Floor.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpFloor::filler(const tflite::Operator *, TFliteImport *, tflchef::ModelRecipe *) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpFloor::build(const tflite::Operator *, TFliteImport *,
-                                         tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Floor");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Floor.h b/compiler/tflchef/tflite/src/Op/Floor.h
deleted file mode 100644
index f0f8ef38a..000000000
--- a/compiler/tflchef/tflite/src/Op/Floor.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_FLOOR_H__
-#define __TFLITE_OP_FLOOR_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for FLOOR
- */
-class TFliteOpFloor : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_FLOOR_H__
diff --git a/compiler/tflchef/tflite/src/Op/FloorDiv.cpp b/compiler/tflchef/tflite/src/Op/FloorDiv.cpp
deleted file mode 100644
index 492c6941f..000000000
--- a/compiler/tflchef/tflite/src/Op/FloorDiv.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "FloorDiv.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpFloorDiv::filler(const tflite::Operator *op, TFliteImport *import,
-                              tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpFloorDiv::build(const tflite::Operator *op, TFliteImport *import,
-                                            tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("FloorDiv");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/FloorDiv.h b/compiler/tflchef/tflite/src/Op/FloorDiv.h
deleted file mode 100644
index 5d049a668..000000000
--- a/compiler/tflchef/tflite/src/Op/FloorDiv.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_FLOORDIV_H__
-#define __TFLITE_OP_FLOORDIV_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for floor division
- */
-class TFliteOpFloorDiv : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_FLOORDIV_H__
diff --git a/compiler/tflchef/tflite/src/Op/FloorMod.cpp b/compiler/tflchef/tflite/src/Op/FloorMod.cpp
deleted file mode 100644
index 997d82664..000000000
--- a/compiler/tflchef/tflite/src/Op/FloorMod.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "FloorMod.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpFloorMod::filler(const tflite::Operator *op, TFliteImport *import,
-                              tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpFloorMod::build(const tflite::Operator *op, TFliteImport *import,
-                                            tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("FloorMod");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/FloorMod.h b/compiler/tflchef/tflite/src/Op/FloorMod.h
deleted file mode 100644
index f36dfe813..000000000
--- a/compiler/tflchef/tflite/src/Op/FloorMod.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_FLOOR_MOD_H__
-#define __TFLITE_OP_FLOOR_MOD_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for FLOOR_MOD
- */
-class TFliteOpFloorMod : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_FLOOR_MOD_H__
diff --git a/compiler/tflchef/tflite/src/Op/FullyConnected.cpp b/compiler/tflchef/tflite/src/Op/FullyConnected.cpp
index 1f6e73aa6..4291c844b 100644
--- a/compiler/tflchef/tflite/src/Op/FullyConnected.cpp
+++ b/compiler/tflchef/tflite/src/Op/FullyConnected.cpp
@@ -17,7 +17,6 @@
 #include "FullyConnected.h"
 
 #include "Convert.h"
-#include "FillerHelper.h"
 
 namespace tflchef
 {
@@ -25,14 +24,7 @@ namespace tflchef
 void TFliteOpFullyConnected::filler(const tflite::Operator *op, TFliteImport *import,
                                     tflchef::ModelRecipe *model_recipe) const
 {
-  const auto &inputs = *op->inputs();
-
-  for (uint32_t idx = 1; idx < inputs.size(); idx++)
-  {
-    // optional input tensor idx has minus value.
-    if (inputs[idx] >= 0)
-      fill_tensor_to_import(inputs[idx], import);
-  }
+  // Nothing to do with filler
 }
 
 tflchef::Operation *TFliteOpFullyConnected::build(const tflite::Operator *op, TFliteImport *import,
diff --git a/compiler/tflchef/tflite/src/Op/Gather.cpp b/compiler/tflchef/tflite/src/Op/Gather.cpp
deleted file mode 100644
index 98da3ec43..000000000
--- a/compiler/tflchef/tflite/src/Op/Gather.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Gather.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpGather::filler(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-  // But second input has filler for constant inputs
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *tensor = import->tensors()->Get(inputs[1]);
-  assert(tensor->type() == tflite::TensorType::TensorType_INT32);
-  const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-
-  if (buffer && buffer->data())
-  {
-    auto vec = extract_buffer<int32_t>(buffer);
-    import->set_tensor_filler(inputs[1], vec);
-  }
-}
-
-tflchef::Operation *TFliteOpGather::build(const tflite::Operator *op, TFliteImport *import,
-                                          tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_GatherOptions();
-  assert(op_params != nullptr);
-
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Gather");
-
-  auto op_options = operation->mutable_gather_options();
-
-  op_options->set_axis(op_params->axis());
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Gather.h b/compiler/tflchef/tflite/src/Op/Gather.h
deleted file mode 100644
index e01276b76..000000000
--- a/compiler/tflchef/tflite/src/Op/Gather.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_GATHER_H__
-#define __TFLITE_OP_GATHER_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Gather
- */
-class TFliteOpGather : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_GATHER_H__
diff --git a/compiler/tflchef/tflite/src/Op/GatherNd.cpp b/compiler/tflchef/tflite/src/Op/GatherNd.cpp
deleted file mode 100644
index 0ff5a0b7f..000000000
--- a/compiler/tflchef/tflite/src/Op/GatherNd.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "GatherNd.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpGatherNd::filler(const tflite::Operator *op, TFliteImport *import,
-                              tflchef::ModelRecipe *model_recipe) const
-{
-  // indices buffer has filler
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *tensor = import->tensors()->Get(inputs[1]);
-  assert(tensor->type() == tflite::TensorType::TensorType_INT32);
-  const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-
-  if (buffer && buffer->data())
-  {
-    auto vec = extract_buffer<int32_t>(buffer);
-    import->set_tensor_filler(inputs[1], vec);
-  }
-}
-
-tflchef::Operation *TFliteOpGatherNd::build(const tflite::Operator *op, TFliteImport *import,
-                                            tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-  operation->set_type("GatherNd");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/GatherNd.h b/compiler/tflchef/tflite/src/Op/GatherNd.h
deleted file mode 100644
index 112f23d33..000000000
--- a/compiler/tflchef/tflite/src/Op/GatherNd.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_GATHER_ND_H__
-#define __TFLITE_OP_GATHER_ND_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for GatherNd
- */
-class TFliteOpGatherNd : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_GATHER_ND_H__
diff --git a/compiler/tflchef/tflite/src/Op/Greater.cpp b/compiler/tflchef/tflite/src/Op/Greater.cpp
deleted file mode 100644
index 4e41efb2d..000000000
--- a/compiler/tflchef/tflite/src/Op/Greater.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Greater.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpGreater::filler(const tflite::Operator *op, TFliteImport *import,
-                             tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpGreater::build(const tflite::Operator *op, TFliteImport *import,
-                                           tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Greater");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Greater.h b/compiler/tflchef/tflite/src/Op/Greater.h
deleted file mode 100644
index 3ab2d1a4e..000000000
--- a/compiler/tflchef/tflite/src/Op/Greater.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_GREATER_H__
-#define __TFLITE_OP_GREATER_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Greater
- */
-class TFliteOpGreater : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_GREATER_H__
diff --git a/compiler/tflchef/tflite/src/Op/GreaterEqual.cpp b/compiler/tflchef/tflite/src/Op/GreaterEqual.cpp
deleted file mode 100644
index aead30e57..000000000
--- a/compiler/tflchef/tflite/src/Op/GreaterEqual.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "GreaterEqual.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpGreaterEqual::filler(const tflite::Operator *op, TFliteImport *import,
-                                  tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpGreaterEqual::build(const tflite::Operator *op, TFliteImport *import,
-                                                tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("GreaterEqual");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/GreaterEqual.h b/compiler/tflchef/tflite/src/Op/GreaterEqual.h
deleted file mode 100644
index 96b0af78a..000000000
--- a/compiler/tflchef/tflite/src/Op/GreaterEqual.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_GREATEREQUAL_H__
-#define __TFLITE_OP_GREATEREQUAL_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Greater Equal
- */
-class TFliteOpGreaterEqual : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_GREATEREQUAL_H__
diff --git a/compiler/tflchef/tflite/src/Op/L2Normalize.cpp b/compiler/tflchef/tflite/src/Op/L2Normalize.cpp
deleted file mode 100644
index 0a8908472..000000000
--- a/compiler/tflchef/tflite/src/Op/L2Normalize.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "L2Normalize.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpL2Normalize::filler(const tflite::Operator *op, TFliteImport *import,
-                                 tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpL2Normalize::build(const tflite::Operator *op, TFliteImport *import,
-                                               tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_L2NormOptions();
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("L2Normalize");
-
-  auto op_options = operation->mutable_l2norm_options();
-
-  op_options->set_activation(as_tflchef_activation(op_params->fused_activation_function()));
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/L2Normalize.h b/compiler/tflchef/tflite/src/Op/L2Normalize.h
deleted file mode 100644
index a73eae6c8..000000000
--- a/compiler/tflchef/tflite/src/Op/L2Normalize.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_L2NORMALIZE_H__
-#define __TFLITE_OP_L2NORMALIZE_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for L2Normalize
- */
-class TFliteOpL2Normalize : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_L2NORMALIZE_H__
diff --git a/compiler/tflchef/tflite/src/Op/L2Pool2D.cpp b/compiler/tflchef/tflite/src/Op/L2Pool2D.cpp
deleted file mode 100644
index 8db4b02b6..000000000
--- a/compiler/tflchef/tflite/src/Op/L2Pool2D.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "L2Pool2D.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpL2Pool2D::filler(const tflite::Operator *op, TFliteImport *import,
-                              tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpL2Pool2D::build(const tflite::Operator *op, TFliteImport *import,
-                                            tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_Pool2DOptions();
-  assert(op_params != nullptr);
-
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("L2Pool2D");
-
-  auto op_options = operation->mutable_l2pool2d_options();
-
-  op_options->set_padding(as_tflchef_padding(op_params->padding()));
-  op_options->set_stride_h(op_params->stride_h());
-  op_options->set_stride_w(op_params->stride_w());
-  op_options->set_filter_height(op_params->filter_height());
-  op_options->set_filter_width(op_params->filter_width());
-  op_options->set_activation(as_tflchef_activation(op_params->fused_activation_function()));
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/L2Pool2D.h b/compiler/tflchef/tflite/src/Op/L2Pool2D.h
deleted file mode 100644
index 046353440..000000000
--- a/compiler/tflchef/tflite/src/Op/L2Pool2D.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_L2_POOL2D_H__
-#define __TFLITE_OP_L2_POOL2D_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for L2_POOL_2D
- */
-class TFliteOpL2Pool2D : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_L2_POOL2D_H__
diff --git a/compiler/tflchef/tflite/src/Op/LeakyRelu.cpp b/compiler/tflchef/tflite/src/Op/LeakyRelu.cpp
deleted file mode 100644
index bf9cb2fb3..000000000
--- a/compiler/tflchef/tflite/src/Op/LeakyRelu.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "LeakyRelu.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpLeakyRelu::filler(const tflite::Operator *op, TFliteImport *import,
-                               tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpLeakyRelu::build(const tflite::Operator *op, TFliteImport *import,
-                                             tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_LeakyReluOptions();
-
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("LeakyRelu");
-
-  auto *op_options = operation->mutable_leaky_relu_options();
-
-  op_options->set_alpha(op_params->alpha());
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/LeakyRelu.h b/compiler/tflchef/tflite/src/Op/LeakyRelu.h
deleted file mode 100644
index 28e63e0ca..000000000
--- a/compiler/tflchef/tflite/src/Op/LeakyRelu.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_LEAKY_RELU_H__
-#define __TFLITE_OP_LEAKY_RELU_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for LeakyReLU
- */
-class TFliteOpLeakyRelu : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_LEAKY_RELU_H__
diff --git a/compiler/tflchef/tflite/src/Op/Less.cpp b/compiler/tflchef/tflite/src/Op/Less.cpp
deleted file mode 100644
index 0360317c7..000000000
--- a/compiler/tflchef/tflite/src/Op/Less.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Less.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpLess::filler(const tflite::Operator *op, TFliteImport *import,
-                          tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpLess::build(const tflite::Operator *op, TFliteImport *import,
-                                        tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Less");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Less.h b/compiler/tflchef/tflite/src/Op/Less.h
deleted file mode 100644
index 1316cb613..000000000
--- a/compiler/tflchef/tflite/src/Op/Less.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_LESS_H__
-#define __TFLITE_OP_LESS_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Less
- */
-class TFliteOpLess : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_LESS_H__
diff --git a/compiler/tflchef/tflite/src/Op/LessEqual.cpp b/compiler/tflchef/tflite/src/Op/LessEqual.cpp
deleted file mode 100644
index b8c42e80d..000000000
--- a/compiler/tflchef/tflite/src/Op/LessEqual.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "LessEqual.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpLessEqual::filler(const tflite::Operator *op, TFliteImport *import,
-                               tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpLessEqual::build(const tflite::Operator *, TFliteImport *,
-                                             tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("LessEqual");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/LessEqual.h b/compiler/tflchef/tflite/src/Op/LessEqual.h
deleted file mode 100644
index 81c710fbc..000000000
--- a/compiler/tflchef/tflite/src/Op/LessEqual.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_LESSEQUAL_H__
-#define __TFLITE_OP_LESSEQUAL_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for LessEqual
- */
-class TFliteOpLessEqual : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_LESSEQUAL_H__
diff --git a/compiler/tflchef/tflite/src/Op/LocalResponseNormalization.cpp b/compiler/tflchef/tflite/src/Op/LocalResponseNormalization.cpp
deleted file mode 100644
index 8bebd9e90..000000000
--- a/compiler/tflchef/tflite/src/Op/LocalResponseNormalization.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "LocalResponseNormalization.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpLocalResponseNormalization::filler(const tflite::Operator *op, TFliteImport *import,
-                                                tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *
-TFliteOpLocalResponseNormalization::build(const tflite::Operator *op, TFliteImport *import,
-                                          tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_LocalResponseNormalizationOptions();
-  assert(op_params != nullptr);
-
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("LocalResponseNormalization");
-
-  auto op_options = operation->mutable_local_response_normalization_options();
-
-  op_options->set_radius(op_params->radius());
-  op_options->set_bias(op_params->bias());
-  op_options->set_alpha(op_params->alpha());
-  op_options->set_beta(op_params->beta());
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/LocalResponseNormalization.h b/compiler/tflchef/tflite/src/Op/LocalResponseNormalization.h
deleted file mode 100644
index c0eb3f2b1..000000000
--- a/compiler/tflchef/tflite/src/Op/LocalResponseNormalization.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_LOCAL_RESPONSE_NORMALIZATION_H__
-#define __TFLITE_OP_LOCAL_RESPONSE_NORMALIZATION_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for LocalResponseNormalization
- */
-class TFliteOpLocalResponseNormalization : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_LOCAL_RESPONSE_NORMALIZATION_H__
diff --git a/compiler/tflchef/tflite/src/Op/Log.cpp b/compiler/tflchef/tflite/src/Op/Log.cpp
deleted file mode 100644
index a68dc9a31..000000000
--- a/compiler/tflchef/tflite/src/Op/Log.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Log.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpLog::filler(const tflite::Operator *op, TFliteImport *import,
-                         tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpLog::build(const tflite::Operator *op, TFliteImport *import,
-                                       tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Log");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Log.h b/compiler/tflchef/tflite/src/Op/Log.h
deleted file mode 100644
index 9d17e2f81..000000000
--- a/compiler/tflchef/tflite/src/Op/Log.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_LOG_H__
-#define __TFLITE_OP_LOG_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Log
- */
-class TFliteOpLog : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_LOG_H__
diff --git a/compiler/tflchef/tflite/src/Op/LogSoftmax.cpp b/compiler/tflchef/tflite/src/Op/LogSoftmax.cpp
deleted file mode 100644
index 8f0e1a9f9..000000000
--- a/compiler/tflchef/tflite/src/Op/LogSoftmax.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "LogSoftmax.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpLogSoftmax::filler(const tflite::Operator *op, TFliteImport *import,
-                                tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpLogSoftmax::build(const tflite::Operator *op, TFliteImport *import,
-                                              tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("LogSoftmax");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/LogSoftmax.h b/compiler/tflchef/tflite/src/Op/LogSoftmax.h
deleted file mode 100644
index efd81f3e9..000000000
--- a/compiler/tflchef/tflite/src/Op/LogSoftmax.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_LOG_SOFTMAX_H__
-#define __TFLITE_OP_LOG_SOFTMAX_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for LogSoftmax
- */
-class TFliteOpLogSoftmax : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_LOG_SOFTMAX_H__
diff --git a/compiler/tflchef/tflite/src/Op/LogicalAnd.cpp b/compiler/tflchef/tflite/src/Op/LogicalAnd.cpp
deleted file mode 100644
index 2cc486426..000000000
--- a/compiler/tflchef/tflite/src/Op/LogicalAnd.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "LogicalAnd.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpLogicalAnd::filler(const tflite::Operator *op, TFliteImport *import,
-                                tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpLogicalAnd::build(const tflite::Operator *op, TFliteImport *import,
-                                              tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("LogicalAnd");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/LogicalAnd.h b/compiler/tflchef/tflite/src/Op/LogicalAnd.h
deleted file mode 100644
index 1f7a964b9..000000000
--- a/compiler/tflchef/tflite/src/Op/LogicalAnd.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_LOGICALAND_H__
-#define __TFLITE_OP_LOGICALAND_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for LogicalAnd
- */
-class TFliteOpLogicalAnd : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_LOGICALAND_H__
diff --git a/compiler/tflchef/tflite/src/Op/LogicalNot.cpp b/compiler/tflchef/tflite/src/Op/LogicalNot.cpp
deleted file mode 100644
index ecd5b903c..000000000
--- a/compiler/tflchef/tflite/src/Op/LogicalNot.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "LogicalNot.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpLogicalNot::filler(const tflite::Operator *op, TFliteImport *import,
-                                tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpLogicalNot::build(const tflite::Operator *op, TFliteImport *import,
-                                              tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("LogicalNot");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/LogicalNot.h b/compiler/tflchef/tflite/src/Op/LogicalNot.h
deleted file mode 100644
index b75d33554..000000000
--- a/compiler/tflchef/tflite/src/Op/LogicalNot.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_LOGICALNOT_H__
-#define __TFLITE_OP_LOGICALNOT_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for LogicalNot
- */
-class TFliteOpLogicalNot : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_LOGICALNOT_H__
diff --git a/compiler/tflchef/tflite/src/Op/LogicalOr.cpp b/compiler/tflchef/tflite/src/Op/LogicalOr.cpp
deleted file mode 100644
index b91f4cfca..000000000
--- a/compiler/tflchef/tflite/src/Op/LogicalOr.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "LogicalOr.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpLogicalOr::filler(const tflite::Operator *op, TFliteImport *import,
-                               tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpLogicalOr::build(const tflite::Operator *op, TFliteImport *import,
-                                             tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("LogicalOr");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/LogicalOr.h b/compiler/tflchef/tflite/src/Op/LogicalOr.h
deleted file mode 100644
index 5331a0d65..000000000
--- a/compiler/tflchef/tflite/src/Op/LogicalOr.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_LOGICALOR_H__
-#define __TFLITE_OP_LOGICALOR_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for LogicalOr
- */
-class TFliteOpLogicalOr : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_LOGICALOR_H__
diff --git a/compiler/tflchef/tflite/src/Op/Logistic.cpp b/compiler/tflchef/tflite/src/Op/Logistic.cpp
deleted file mode 100644
index 18b3b5c00..000000000
--- a/compiler/tflchef/tflite/src/Op/Logistic.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Logistic.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpLogistic::filler(const tflite::Operator *, TFliteImport *,
-                              tflchef::ModelRecipe *) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpLogistic::build(const tflite::Operator *, TFliteImport *,
-                                            tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Logistic");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Logistic.h b/compiler/tflchef/tflite/src/Op/Logistic.h
deleted file mode 100644
index a75bf490e..000000000
--- a/compiler/tflchef/tflite/src/Op/Logistic.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_LOGISTIC_H__
-#define __TFLITE_OP_LOGISTIC_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for LOGISTIC
- */
-class TFliteOpLogistic : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_LOGISTIC_H__
diff --git a/compiler/tflchef/tflite/src/Op/MatrixDiag.cpp b/compiler/tflchef/tflite/src/Op/MatrixDiag.cpp
deleted file mode 100644
index ca84c4949..000000000
--- a/compiler/tflchef/tflite/src/Op/MatrixDiag.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "MatrixDiag.h"
-
-namespace tflchef
-{
-
-void TFliteOpMatrixDiag::filler(const tflite::Operator *op, TFliteImport *import,
-                                tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpMatrixDiag::build(const tflite::Operator *op, TFliteImport *import,
-                                              tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("MatrixDiag");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/MatrixDiag.h b/compiler/tflchef/tflite/src/Op/MatrixDiag.h
deleted file mode 100644
index 4074f2c36..000000000
--- a/compiler/tflchef/tflite/src/Op/MatrixDiag.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_MATRIX_DIAG_H__
-#define __TFLITE_OP_MATRIX_DIAG_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for MatrixDiag
- */
-class TFliteOpMatrixDiag : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_MATRIX_DIAG_H__
diff --git a/compiler/tflchef/tflite/src/Op/MatrixSetDiag.cpp b/compiler/tflchef/tflite/src/Op/MatrixSetDiag.cpp
deleted file mode 100644
index 97c7de41f..000000000
--- a/compiler/tflchef/tflite/src/Op/MatrixSetDiag.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "MatrixSetDiag.h"
-
-namespace tflchef
-{
-
-void TFliteOpMatrixSetDiag::filler(const tflite::Operator *, TFliteImport *,
-                                   tflchef::ModelRecipe *) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpMatrixSetDiag::build(const tflite::Operator *, TFliteImport *,
-                                                 tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("MatrixSetDiag");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/MatrixSetDiag.h b/compiler/tflchef/tflite/src/Op/MatrixSetDiag.h
deleted file mode 100644
index 0e7ec7f32..000000000
--- a/compiler/tflchef/tflite/src/Op/MatrixSetDiag.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_MATRIX_SET_DIAG_H__
-#define __TFLITE_OP_MATRIX_SET_DIAG_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for MatrixSetDiag
- */
-class TFliteOpMatrixSetDiag : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_MATRIX_SET_DIAG_H__
diff --git a/compiler/tflchef/tflite/src/Op/Maximum.cpp b/compiler/tflchef/tflite/src/Op/Maximum.cpp
deleted file mode 100644
index fb977b6ed..000000000
--- a/compiler/tflchef/tflite/src/Op/Maximum.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Maximum.h"
-
-namespace tflchef
-{
-
-void TFliteOpMaximum::filler(const tflite::Operator *op, TFliteImport *import,
-                             tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpMaximum::build(const tflite::Operator *op, TFliteImport *import,
-                                           tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Maximum");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Maximum.h b/compiler/tflchef/tflite/src/Op/Maximum.h
deleted file mode 100644
index acafec343..000000000
--- a/compiler/tflchef/tflite/src/Op/Maximum.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_MAXIMUM_H__
-#define __TFLITE_OP_MAXIMUM_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for maximum
- */
-class TFliteOpMaximum : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_MAXIMUM_H__
diff --git a/compiler/tflchef/tflite/src/Op/Mean.cpp b/compiler/tflchef/tflite/src/Op/Mean.cpp
deleted file mode 100644
index 1c2975781..000000000
--- a/compiler/tflchef/tflite/src/Op/Mean.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Mean.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpMean::filler(const tflite::Operator *op, TFliteImport *import,
-                          tflchef::ModelRecipe *model_recipe) const
-{
-  // filler for second input
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *tensor = import->tensors()->Get(inputs[1]);
-  assert(tensor->type() == tflite::TensorType::TensorType_INT32);
-  const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-  auto vec = extract_buffer<int32_t>(buffer);
-  import->set_tensor_filler(inputs[1], vec);
-}
-
-tflchef::Operation *TFliteOpMean::build(const tflite::Operator *op, TFliteImport *import,
-                                        tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_ReducerOptions();
-  assert(op_params != nullptr);
-
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Mean");
-
-  auto op_options = operation->mutable_mean_options();
-
-  op_options->set_keep_dims(op_params->keep_dims());
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Mean.h b/compiler/tflchef/tflite/src/Op/Mean.h
deleted file mode 100644
index 532c40c66..000000000
--- a/compiler/tflchef/tflite/src/Op/Mean.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_MEAN_H__
-#define __TFLITE_OP_MEAN_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for mean
- */
-class TFliteOpMean : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_MEAN_H__
diff --git a/compiler/tflchef/tflite/src/Op/Minimum.cpp b/compiler/tflchef/tflite/src/Op/Minimum.cpp
deleted file mode 100644
index 2bb50cb89..000000000
--- a/compiler/tflchef/tflite/src/Op/Minimum.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Minimum.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpMinimum::filler(const tflite::Operator *op, TFliteImport *import,
-                             tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpMinimum::build(const tflite::Operator *op, TFliteImport *import,
-                                           tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Minimum");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Minimum.h b/compiler/tflchef/tflite/src/Op/Minimum.h
deleted file mode 100644
index 5db5b7940..000000000
--- a/compiler/tflchef/tflite/src/Op/Minimum.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_MINIMUM_H__
-#define __TFLITE_OP_MINIMUM_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for minimum
- */
-class TFliteOpMinimum : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_MINIMUM_H__
diff --git a/compiler/tflchef/tflite/src/Op/MirrorPad.cpp b/compiler/tflchef/tflite/src/Op/MirrorPad.cpp
deleted file mode 100644
index c688552ee..000000000
--- a/compiler/tflchef/tflite/src/Op/MirrorPad.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "MirrorPad.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpMirrorPad::filler(const tflite::Operator *op, TFliteImport *import,
-                               tflchef::ModelRecipe *model_recipe) const
-{
-  // filler for second input
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *tensor = import->tensors()->Get(inputs[1]);
-  assert(tensor->type() == tflite::TensorType::TensorType_INT32);
-  const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-  auto vec = extract_buffer<int32_t>(buffer);
-  import->set_tensor_filler(inputs[1], vec);
-}
-
-tflchef::Operation *TFliteOpMirrorPad::build(const tflite::Operator *op, TFliteImport *import,
-                                             tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-  operation->set_type("MirrorPad");
-
-  auto op_options = operation->mutable_mirrorpad_options();
-
-  auto op_params = op->builtin_options_as_MirrorPadOptions();
-  assert(op_params != nullptr);
-
-  op_options->set_mode(as_tflchef_mirrorpadmode(op_params->mode()));
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/MirrorPad.h b/compiler/tflchef/tflite/src/Op/MirrorPad.h
deleted file mode 100644
index c9acdd498..000000000
--- a/compiler/tflchef/tflite/src/Op/MirrorPad.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_MIRROR_PAD_H__
-#define __TFLITE_OP_MIRROR_PAD_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for MIRROR_PAD
- */
-class TFliteOpMirrorPad : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_MIRROR_PAD_H__
diff --git a/compiler/tflchef/tflite/src/Op/Mul.cpp b/compiler/tflchef/tflite/src/Op/Mul.cpp
deleted file mode 100644
index 9faa4acaf..000000000
--- a/compiler/tflchef/tflite/src/Op/Mul.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Mul.h"
-
-#include "Convert.h"
-#include "FillerHelper.h"
-
-namespace tflchef
-{
-
-void TFliteOpMul::filler(const tflite::Operator *op, TFliteImport *import,
-                         tflchef::ModelRecipe *model_recipe) const
-{
-  // Mul may have constant input
-
-  const std::vector<int32_t> &inputs = as_index_vector(op->inputs());
-  assert(inputs.size() == 2);
-
-  fill_tensor_to_import(inputs[0], import);
-  fill_tensor_to_import(inputs[1], import);
-}
-
-tflchef::Operation *TFliteOpMul::build(const tflite::Operator *op, TFliteImport *import,
-                                       tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Mul");
-
-  auto op_params = op->builtin_options_as_MulOptions();
-  assert(op_params != nullptr);
-
-  auto op_options = operation->mutable_mul_options();
-  op_options->set_activation(as_tflchef_activation(op_params->fused_activation_function()));
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Mul.h b/compiler/tflchef/tflite/src/Op/Mul.h
deleted file mode 100644
index fd009d2fd..000000000
--- a/compiler/tflchef/tflite/src/Op/Mul.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_MUL_H__
-#define __TFLITE_OP_MUL_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for MUL
- */
-class TFliteOpMul : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_MUL_H__
diff --git a/compiler/tflchef/tflite/src/Op/Neg.cpp b/compiler/tflchef/tflite/src/Op/Neg.cpp
deleted file mode 100644
index c691390a3..000000000
--- a/compiler/tflchef/tflite/src/Op/Neg.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Neg.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpNeg::filler(const tflite::Operator *op, TFliteImport *import,
-                         tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpNeg::build(const tflite::Operator *op, TFliteImport *import,
-                                       tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Neg");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Neg.h b/compiler/tflchef/tflite/src/Op/Neg.h
deleted file mode 100644
index c77ab7e84..000000000
--- a/compiler/tflchef/tflite/src/Op/Neg.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_NEG_H__
-#define __TFLITE_OP_NEG_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for abs
- */
-class TFliteOpNeg : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_NEG_H__
diff --git a/compiler/tflchef/tflite/src/Op/NonMaxSuppressionV4.cpp b/compiler/tflchef/tflite/src/Op/NonMaxSuppressionV4.cpp
deleted file mode 100644
index ad9921970..000000000
--- a/compiler/tflchef/tflite/src/Op/NonMaxSuppressionV4.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "NonMaxSuppressionV4.h"
-
-#include "Convert.h"
-#include "FillerHelper.h"
-
-namespace tflchef
-{
-
-void TFliteOpNonMaxSuppressionV4::filler(const tflite::Operator *op, TFliteImport *import,
-                                         tflchef::ModelRecipe *model_recipe) const
-{
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *max_output_size_tensor = import->tensors()->Get(inputs[2]);
-  assert(max_output_size_tensor->type() == tflite::TensorType::TensorType_INT32);
-
-  const tflite::Tensor *iou_threshold_tensor = import->tensors()->Get(inputs[3]);
-  assert(iou_threshold_tensor->type() == tflite::TensorType::TensorType_FLOAT32);
-
-  const tflite::Tensor *score_threshold_tensor = import->tensors()->Get(inputs[4]);
-  assert(score_threshold_tensor->type() == tflite::TensorType::TensorType_FLOAT32);
-
-  for (int32_t index = 2; index < 5; ++index)
-  {
-    fill_tensor_to_import(index, import);
-  }
-}
-
-tflchef::Operation *TFliteOpNonMaxSuppressionV4::build(const tflite::Operator *op,
-                                                       TFliteImport *import,
-                                                       tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("NonMaxSuppressionV4");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/NonMaxSuppressionV4.h b/compiler/tflchef/tflite/src/Op/NonMaxSuppressionV4.h
deleted file mode 100644
index 114a2ad2f..000000000
--- a/compiler/tflchef/tflite/src/Op/NonMaxSuppressionV4.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_NON_MAX_SUPPRESSION_V4_H__
-#define __TFLITE_OP_NON_MAX_SUPPRESSION_V4_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for NON_MAX_SUPPRESSION_V4
- */
-class TFliteOpNonMaxSuppressionV4 : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_NON_MAX_SUPPRESSION_V4_H__
diff --git a/compiler/tflchef/tflite/src/Op/NonMaxSuppressionV5.cpp b/compiler/tflchef/tflite/src/Op/NonMaxSuppressionV5.cpp
deleted file mode 100644
index db7f4c932..000000000
--- a/compiler/tflchef/tflite/src/Op/NonMaxSuppressionV5.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "NonMaxSuppressionV5.h"
-
-#include "Convert.h"
-#include "FillerHelper.h"
-
-namespace tflchef
-{
-
-void TFliteOpNonMaxSuppressionV5::filler(const tflite::Operator *op, TFliteImport *import,
-                                         tflchef::ModelRecipe *model_recipe) const
-{
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *max_output_size_tensor = import->tensors()->Get(inputs[2]);
-  assert(max_output_size_tensor->type() == tflite::TensorType::TensorType_INT32);
-
-  const tflite::Tensor *iou_threshold_tensor = import->tensors()->Get(inputs[3]);
-  assert(iou_threshold_tensor->type() == tflite::TensorType::TensorType_FLOAT32);
-
-  const tflite::Tensor *score_threshold_tensor = import->tensors()->Get(inputs[4]);
-  assert(score_threshold_tensor->type() == tflite::TensorType::TensorType_FLOAT32);
-
-  const tflite::Tensor *soft_nms_sigma_tensor = import->tensors()->Get(inputs[5]);
-  assert(soft_nms_sigma_tensor->type() == tflite::TensorType::TensorType_FLOAT32);
-
-  for (int32_t index = 2; index < 6; ++index)
-  {
-    fill_tensor_to_import(index, import);
-  }
-}
-
-tflchef::Operation *TFliteOpNonMaxSuppressionV5::build(const tflite::Operator *op,
-                                                       TFliteImport *import,
-                                                       tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("NonMaxSuppressionV5");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/NonMaxSuppressionV5.h b/compiler/tflchef/tflite/src/Op/NonMaxSuppressionV5.h
deleted file mode 100644
index c948043f4..000000000
--- a/compiler/tflchef/tflite/src/Op/NonMaxSuppressionV5.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_NON_MAX_SUPPRESSION_V5_H__
-#define __TFLITE_OP_NON_MAX_SUPPRESSION_V5_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for NON_MAX_SUPPRESSION_V5
- */
-class TFliteOpNonMaxSuppressionV5 : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_NON_MAX_SUPPRESSION_V5_H__
diff --git a/compiler/tflchef/tflite/src/Op/NotEqual.cpp b/compiler/tflchef/tflite/src/Op/NotEqual.cpp
deleted file mode 100644
index c2275db06..000000000
--- a/compiler/tflchef/tflite/src/Op/NotEqual.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "NotEqual.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpNotEqual::filler(const tflite::Operator *op, TFliteImport *import,
-                              tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpNotEqual::build(const tflite::Operator *op, TFliteImport *import,
-                                            tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("NotEqual");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/NotEqual.h b/compiler/tflchef/tflite/src/Op/NotEqual.h
deleted file mode 100644
index b1febdcc5..000000000
--- a/compiler/tflchef/tflite/src/Op/NotEqual.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_NOTEQUAL_H__
-#define __TFLITE_OP_NOTEQUAL_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Not Equal
- */
-class TFliteOpNotEqual : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_NOTEQUAL_H__
diff --git a/compiler/tflchef/tflite/src/Op/OneHot.cpp b/compiler/tflchef/tflite/src/Op/OneHot.cpp
deleted file mode 100644
index f26ed3e7f..000000000
--- a/compiler/tflchef/tflite/src/Op/OneHot.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "OneHot.h"
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpOneHot::filler(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const
-{
-  // only depth(second input) has constant on recipe cause depth value is used in shape inference.
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *tensor = import->tensors()->Get(inputs[1]);
-  assert(tensor->type() == tflite::TensorType::TensorType_INT32);
-  const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-
-  if (buffer && buffer->data())
-  {
-    auto vec = extract_buffer<int32_t>(buffer);
-    import->set_tensor_filler(inputs[1], vec);
-  }
-
-  // on/off can be dtype of input/output. let's support INT32/FLOAT32 for now
-  for (int32_t index = 2; index <= 3; ++index)
-  {
-    const tflite::Tensor *tensor = import->tensors()->Get(inputs[index]);
-    const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-    if (buffer && buffer->data())
-    {
-      switch (tensor->type())
-      {
-        case tflite::TensorType::TensorType_INT32:
-        {
-          auto vec = extract_buffer<int32_t>(buffer);
-          import->set_tensor_filler(inputs[index], vec);
-          break;
-        }
-
-        case tflite::TensorType::TensorType_FLOAT32:
-        {
-          auto vec = extract_buffer<float>(buffer);
-          import->set_tensor_filler(inputs[index], vec);
-          break;
-        }
-
-        default:
-          assert(false);
-          break;
-      }
-    }
-  }
-}
-
-tflchef::Operation *TFliteOpOneHot::build(const tflite::Operator *op, TFliteImport *import,
-                                          tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_OneHotOptions();
-  assert(op_params != nullptr);
-
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("OneHot");
-
-  auto op_options = operation->mutable_onehot_options();
-
-  op_options->set_axis(op_params->axis());
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/OneHot.h b/compiler/tflchef/tflite/src/Op/OneHot.h
deleted file mode 100644
index 50bbed095..000000000
--- a/compiler/tflchef/tflite/src/Op/OneHot.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_ONEHOT_H__
-#define __TFLITE_OP_ONEHOT_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for OneHot
- */
-class TFliteOpOneHot : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_ONEHOT_H__
diff --git a/compiler/tflchef/tflite/src/Op/PRelu.cpp b/compiler/tflchef/tflite/src/Op/PRelu.cpp
deleted file mode 100644
index 8a5e83a84..000000000
--- a/compiler/tflchef/tflite/src/Op/PRelu.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "PRelu.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpPRelu::filler(const tflite::Operator *op, TFliteImport *import,
-                           tflchef::ModelRecipe *model_recipe) const
-{
-}
-
-tflchef::Operation *TFliteOpPRelu::build(const tflite::Operator *op, TFliteImport *import,
-                                         tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-  operation->set_type("PRelu");
-
-  // PReluOptions are empty
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/PRelu.h b/compiler/tflchef/tflite/src/Op/PRelu.h
deleted file mode 100644
index b35c6e7ce..000000000
--- a/compiler/tflchef/tflite/src/Op/PRelu.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_PRELU_H__
-#define __TFLITE_OP_PRELU_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for PRelu
- */
-class TFliteOpPRelu : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_PRELU_H__
diff --git a/compiler/tflchef/tflite/src/Op/Pack.cpp b/compiler/tflchef/tflite/src/Op/Pack.cpp
deleted file mode 100644
index ddf8c7d5d..000000000
--- a/compiler/tflchef/tflite/src/Op/Pack.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Pack.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpPack::filler(const tflite::Operator *op, TFliteImport *import,
-                          tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpPack::build(const tflite::Operator *op, TFliteImport *import,
-                                        tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_PackOptions();
-  assert(op_params != nullptr);
-
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Pack");
-
-  auto op_options = operation->mutable_pack_options();
-
-  op_options->set_axis(op_params->axis());
-  op_options->set_values_count(op_params->values_count());
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Pack.h b/compiler/tflchef/tflite/src/Op/Pack.h
deleted file mode 100644
index 7779f64ed..000000000
--- a/compiler/tflchef/tflite/src/Op/Pack.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_PACK_H__
-#define __TFLITE_OP_PACK_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for pack
- */
-class TFliteOpPack : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_PACK_H__
diff --git a/compiler/tflchef/tflite/src/Op/Pad.cpp b/compiler/tflchef/tflite/src/Op/Pad.cpp
deleted file mode 100644
index 2978e4422..000000000
--- a/compiler/tflchef/tflite/src/Op/Pad.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Pad.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpPad::filler(const tflite::Operator *op, TFliteImport *import,
-                         tflchef::ModelRecipe *model_recipe) const
-{
-  // filler for second input
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *tensor = import->tensors()->Get(inputs[1]);
-  assert(tensor->type() == tflite::TensorType::TensorType_INT32);
-  const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-  auto vec = extract_buffer<int32_t>(buffer);
-  import->set_tensor_filler(inputs[1], vec);
-}
-
-tflchef::Operation *TFliteOpPad::build(const tflite::Operator *op, TFliteImport *import,
-                                       tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Pad");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Pad.h b/compiler/tflchef/tflite/src/Op/Pad.h
deleted file mode 100644
index 99998d418..000000000
--- a/compiler/tflchef/tflite/src/Op/Pad.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_PAD_H__
-#define __TFLITE_OP_PAD_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for PAD
- */
-class TFliteOpPad : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_PAD_H__
diff --git a/compiler/tflchef/tflite/src/Op/PadV2.cpp b/compiler/tflchef/tflite/src/Op/PadV2.cpp
deleted file mode 100644
index 0b1c9f3b2..000000000
--- a/compiler/tflchef/tflite/src/Op/PadV2.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "PadV2.h"
-
-#include "FillerHelper.h"
-
-namespace tflchef
-{
-
-void TFliteOpPadV2::filler(const tflite::Operator *op, TFliteImport *import,
-                           tflchef::ModelRecipe *model_recipe) const
-{
-  // Filler for paddings and constant_values
-  fill_tensor_to_import(1, import);
-  fill_tensor_to_import(2, import);
-}
-
-tflchef::Operation *TFliteOpPadV2::build(const tflite::Operator *op, TFliteImport *import,
-                                         tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("PadV2");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/PadV2.h b/compiler/tflchef/tflite/src/Op/PadV2.h
deleted file mode 100644
index 3aa474b92..000000000
--- a/compiler/tflchef/tflite/src/Op/PadV2.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_PADV2_H__
-#define __TFLITE_OP_PADV2_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for PADV2
- */
-class TFliteOpPadV2 : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_PADV2_H__
diff --git a/compiler/tflchef/tflite/src/Op/Pow.cpp b/compiler/tflchef/tflite/src/Op/Pow.cpp
deleted file mode 100644
index fe8e8ac0f..000000000
--- a/compiler/tflchef/tflite/src/Op/Pow.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Pow.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpPow::filler(const tflite::Operator *op, TFliteImport *import,
-                         tflchef::ModelRecipe *model_recipe) const
-{
-}
-
-tflchef::Operation *TFliteOpPow::build(const tflite::Operator *op, TFliteImport *import,
-                                       tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-  operation->set_type("Pow");
-
-  // PowOptions are empty
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Pow.h b/compiler/tflchef/tflite/src/Op/Pow.h
deleted file mode 100644
index 20e847377..000000000
--- a/compiler/tflchef/tflite/src/Op/Pow.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_POW_H__
-#define __TFLITE_OP_POW_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Pow
- */
-class TFliteOpPow : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_POW_H__
diff --git a/compiler/tflchef/tflite/src/Op/Range.cpp b/compiler/tflchef/tflite/src/Op/Range.cpp
deleted file mode 100644
index 2958b9c41..000000000
--- a/compiler/tflchef/tflite/src/Op/Range.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Range.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpRange::filler(const tflite::Operator *op, TFliteImport *import,
-                           tflchef::ModelRecipe *model_recipe) const
-{
-  // filler for all inputs
-  const auto &inputs = *op->inputs();
-
-  for (int index = 0; index < 3; ++index)
-  {
-    const tflite::Tensor *tensor = import->tensors()->Get(inputs[index]);
-    const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-    if (tensor->type() == tflite::TensorType::TensorType_INT32)
-    {
-      auto vec = extract_buffer<int32_t>(buffer);
-      import->set_tensor_filler(inputs[index], vec);
-    }
-    else if (tensor->type() == tflite::TensorType::TensorType_FLOAT32)
-    {
-      auto vec = extract_buffer<float>(buffer);
-      import->set_tensor_filler(inputs[index], vec);
-    }
-    else
-    {
-      assert(false && "Invalid tensor type");
-    }
-  }
-}
-
-tflchef::Operation *TFliteOpRange::build(const tflite::Operator *op, TFliteImport *import,
-                                         tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Range");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Range.h b/compiler/tflchef/tflite/src/Op/Range.h
deleted file mode 100644
index ad10dc58b..000000000
--- a/compiler/tflchef/tflite/src/Op/Range.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_RANGE_H__
-#define __TFLITE_OP_RANGE_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for abs
- */
-class TFliteOpRange : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_RANGE_H__
diff --git a/compiler/tflchef/tflite/src/Op/Rank.cpp b/compiler/tflchef/tflite/src/Op/Rank.cpp
deleted file mode 100644
index 184c8e482..000000000
--- a/compiler/tflchef/tflite/src/Op/Rank.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Rank.h"
-
-namespace tflchef
-{
-
-void TFliteOpRank::filler(const tflite::Operator *op, TFliteImport *import,
-                          tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpRank::build(const tflite::Operator *, TFliteImport *import,
-                                        tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Rank");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Rank.h b/compiler/tflchef/tflite/src/Op/Rank.h
deleted file mode 100644
index 003d9d310..000000000
--- a/compiler/tflchef/tflite/src/Op/Rank.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_RANK_H__
-#define __TFLITE_OP_RANK_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for rank
- */
-class TFliteOpRank : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_RANK_H__
diff --git a/compiler/tflchef/tflite/src/Op/ReLUN1To1.cpp b/compiler/tflchef/tflite/src/Op/ReLUN1To1.cpp
deleted file mode 100644
index 4cc8dbd2b..000000000
--- a/compiler/tflchef/tflite/src/Op/ReLUN1To1.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ReLUN1To1.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpReLUN1To1::filler(const tflite::Operator *op, TFliteImport *import,
-                               tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpReLUN1To1::build(const tflite::Operator *op, TFliteImport *import,
-                                             tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("ReLUN1To1");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/ReLUN1To1.h b/compiler/tflchef/tflite/src/Op/ReLUN1To1.h
deleted file mode 100644
index 0767006af..000000000
--- a/compiler/tflchef/tflite/src/Op/ReLUN1To1.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_RELU_N1_TO_1_H__
-#define __TFLITE_OP_RELU_N1_TO_1_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for RELU_N1_TO_1
- */
-class TFliteOpReLUN1To1 : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_RELU_N1_TO_1_H__
diff --git a/compiler/tflchef/tflite/src/Op/ReduceAny.cpp b/compiler/tflchef/tflite/src/Op/ReduceAny.cpp
deleted file mode 100644
index e0cc503c4..000000000
--- a/compiler/tflchef/tflite/src/Op/ReduceAny.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ReduceAny.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpReduceAny::filler(const tflite::Operator *op, TFliteImport *import,
-                               tflchef::ModelRecipe *model_recipe) const
-{
-  // filler for second input
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *tensor = import->tensors()->Get(inputs[1]);
-  assert(tensor->type() == tflite::TensorType::TensorType_INT32);
-  const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-  auto vec = extract_buffer<int32_t>(buffer);
-  import->set_tensor_filler(inputs[1], vec);
-}
-
-tflchef::Operation *TFliteOpReduceAny::build(const tflite::Operator *op, TFliteImport *import,
-                                             tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-  operation->set_type("ReduceAny");
-
-  auto op_params = op->builtin_options_as_ReducerOptions();
-  assert(op_params != nullptr);
-
-  auto op_options = operation->mutable_reduce_any_options();
-  op_options->set_keep_dims(op_params->keep_dims());
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/ReduceAny.h b/compiler/tflchef/tflite/src/Op/ReduceAny.h
deleted file mode 100644
index dd5e361d5..000000000
--- a/compiler/tflchef/tflite/src/Op/ReduceAny.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_REDUCE_ANY_H__
-#define __TFLITE_OP_REDUCE_ANY_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for REDUCE_ANY
- */
-class TFliteOpReduceAny : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_REDUCE_ANY_H__
diff --git a/compiler/tflchef/tflite/src/Op/ReduceMax.cpp b/compiler/tflchef/tflite/src/Op/ReduceMax.cpp
deleted file mode 100644
index 499f58566..000000000
--- a/compiler/tflchef/tflite/src/Op/ReduceMax.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ReduceMax.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpReduceMax::filler(const tflite::Operator *op, TFliteImport *import,
-                               tflchef::ModelRecipe *model_recipe) const
-{
-  // filler for second input
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *tensor = import->tensors()->Get(inputs[1]);
-  assert(tensor->type() == tflite::TensorType::TensorType_INT32);
-  const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-  auto vec = extract_buffer<int32_t>(buffer);
-  import->set_tensor_filler(inputs[1], vec);
-}
-
-tflchef::Operation *TFliteOpReduceMax::build(const tflite::Operator *op, TFliteImport *import,
-                                             tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_ReducerOptions();
-  assert(op_params != nullptr);
-
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("ReduceMax");
-
-  auto op_options = operation->mutable_reduce_max_options();
-
-  op_options->set_keep_dims(op_params->keep_dims());
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/ReduceMax.h b/compiler/tflchef/tflite/src/Op/ReduceMax.h
deleted file mode 100644
index 8e65cf47c..000000000
--- a/compiler/tflchef/tflite/src/Op/ReduceMax.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_REDUCEMAX_H__
-#define __TFLITE_OP_REDUCEMAX_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Reduce Max
- */
-class TFliteOpReduceMax : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_REDUCEMAX_H__
diff --git a/compiler/tflchef/tflite/src/Op/ReduceMin.cpp b/compiler/tflchef/tflite/src/Op/ReduceMin.cpp
deleted file mode 100644
index 09e2e134c..000000000
--- a/compiler/tflchef/tflite/src/Op/ReduceMin.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ReduceMin.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpReduceMin::filler(const tflite::Operator *op, TFliteImport *import,
-                               tflchef::ModelRecipe *model_recipe) const
-{
-  // filler for second input
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *tensor = import->tensors()->Get(inputs[1]);
-  assert(tensor->type() == tflite::TensorType::TensorType_INT32);
-  const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-  auto vec = extract_buffer<int32_t>(buffer);
-  import->set_tensor_filler(inputs[1], vec);
-}
-
-tflchef::Operation *TFliteOpReduceMin::build(const tflite::Operator *op, TFliteImport *import,
-                                             tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_ReducerOptions();
-  assert(op_params != nullptr);
-
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("ReduceMin");
-
-  auto op_options = operation->mutable_reduce_min_options();
-
-  op_options->set_keep_dims(op_params->keep_dims());
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/ReduceMin.h b/compiler/tflchef/tflite/src/Op/ReduceMin.h
deleted file mode 100644
index 88cba6fe7..000000000
--- a/compiler/tflchef/tflite/src/Op/ReduceMin.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_REDUCEMIN_H__
-#define __TFLITE_OP_REDUCEMIN_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Reduce Min
- */
-class TFliteOpReduceMin : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_REDUCEMIN_H__
diff --git a/compiler/tflchef/tflite/src/Op/ReduceProd.cpp b/compiler/tflchef/tflite/src/Op/ReduceProd.cpp
deleted file mode 100644
index e2d98970d..000000000
--- a/compiler/tflchef/tflite/src/Op/ReduceProd.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ReduceProd.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpReduceProd::filler(const tflite::Operator *op, TFliteImport *import,
-                                tflchef::ModelRecipe *model_recipe) const
-{
-  // filler for second input
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *tensor = import->tensors()->Get(inputs[1]);
-  assert(tensor->type() == tflite::TensorType::TensorType_INT32);
-  const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-  auto vec = extract_buffer<int32_t>(buffer);
-  import->set_tensor_filler(inputs[1], vec);
-}
-
-tflchef::Operation *TFliteOpReduceProd::build(const tflite::Operator *op, TFliteImport *import,
-                                              tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-  operation->set_type("ReduceProd");
-
-  auto op_params = op->builtin_options_as_ReducerOptions();
-  assert(op_params != nullptr);
-
-  auto op_options = operation->mutable_reduce_prod_options();
-  op_options->set_keep_dims(op_params->keep_dims());
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/ReduceProd.h b/compiler/tflchef/tflite/src/Op/ReduceProd.h
deleted file mode 100644
index e7766840a..000000000
--- a/compiler/tflchef/tflite/src/Op/ReduceProd.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_REDUCE_PROD_H__
-#define __TFLITE_OP_REDUCE_PROD_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for REDUCE_PROD
- */
-class TFliteOpReduceProd : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_REDUCE_PROD_H__
diff --git a/compiler/tflchef/tflite/src/Op/Reshape.cpp b/compiler/tflchef/tflite/src/Op/Reshape.cpp
index 0094d5df5..663ab3ec3 100644
--- a/compiler/tflchef/tflite/src/Op/Reshape.cpp
+++ b/compiler/tflchef/tflite/src/Op/Reshape.cpp
@@ -17,7 +17,6 @@
 #include "Reshape.h"
 
 #include "Convert.h"
-#include "FillerHelper.h"
 
 namespace tflchef
 {
@@ -28,29 +27,33 @@ void TFliteOpReshape::filler(const tflite::Operator *op, TFliteImport *import,
   const std::vector<int32_t> &inputs = as_index_vector(op->inputs());
 
   bool hasShape = (inputs.size() == 2);
+  assert(inputs.size() == 1 || hasShape);
+
   if (hasShape)
   {
-    fill_tensor_to_import(inputs[1], import);
+    auto op_params = op->builtin_options_as_ReshapeOptions();
+    std::vector<int32_t> new_shape = as_index_vector(op_params->new_shape());
+    import->set_tensor_filler(inputs.at(1), new_shape);
   }
 }
 
 tflchef::Operation *TFliteOpReshape::build(const tflite::Operator *op, TFliteImport *import,
                                            tflchef::ModelRecipe *model_recipe) const
 {
+  auto op_params = op->builtin_options_as_ReshapeOptions();
+  assert(op_params != nullptr);
+
   auto operation = model_recipe->add_operation();
 
   operation->set_type("Reshape");
 
-  auto op_params = op->builtin_options_as_ReshapeOptions();
-  if (op_params != nullptr)
-  {
-    auto op_options = operation->mutable_reshape_options();
+  auto op_options = operation->mutable_reshape_options();
 
-    std::vector<int32_t> new_shape = as_index_vector(op_params->new_shape());
-    for (auto shape : new_shape)
-    {
-      op_options->add_new_shape(shape);
-    }
+  std::vector<int32_t> new_shape = as_index_vector(op_params->new_shape());
+
+  for (auto shape : new_shape)
+  {
+    op_options->add_new_shape(shape);
   }
 
   return operation;
diff --git a/compiler/tflchef/tflite/src/Op/ResizeBilinear.cpp b/compiler/tflchef/tflite/src/Op/ResizeBilinear.cpp
deleted file mode 100644
index 0f6db1fcb..000000000
--- a/compiler/tflchef/tflite/src/Op/ResizeBilinear.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ResizeBilinear.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpResizeBilinear::filler(const tflite::Operator *op, TFliteImport *import,
-                                    tflchef::ModelRecipe *model_recipe) const
-{
-  // size buffer has filler
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *tensor = import->tensors()->Get(inputs[1]);
-  assert(tensor->type() == tflite::TensorType::TensorType_INT32);
-  const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-
-  if (buffer && buffer->data())
-  {
-    auto vec = extract_buffer<int32_t>(buffer);
-    import->set_tensor_filler(inputs[1], vec);
-  }
-}
-
-tflchef::Operation *TFliteOpResizeBilinear::build(const tflite::Operator *op, TFliteImport *import,
-                                                  tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_ResizeBilinearOptions();
-  assert(op_params != nullptr);
-
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("ResizeBilinear");
-
-  auto op_options = operation->mutable_resize_bilinear_options();
-
-  op_options->set_align_corners(op_params->align_corners());
-  op_options->set_half_pixel_centers(op_params->half_pixel_centers());
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/ResizeBilinear.h b/compiler/tflchef/tflite/src/Op/ResizeBilinear.h
deleted file mode 100644
index 98c49c534..000000000
--- a/compiler/tflchef/tflite/src/Op/ResizeBilinear.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_RESIZE_BILINEAR_H__
-#define __TFLITE_OP_RESIZE_BILINEAR_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for ResizeBilinear
- */
-class TFliteOpResizeBilinear : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_RESIZE_BILINEAR_H__
diff --git a/compiler/tflchef/tflite/src/Op/ResizeNearestNeighbor.cpp b/compiler/tflchef/tflite/src/Op/ResizeNearestNeighbor.cpp
deleted file mode 100644
index f3dd8fed0..000000000
--- a/compiler/tflchef/tflite/src/Op/ResizeNearestNeighbor.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ResizeNearestNeighbor.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpResizeNearestNeighbor::filler(const tflite::Operator *op, TFliteImport *import,
-                                           tflchef::ModelRecipe *model_recipe) const
-{
-  // size buffer has filler
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *tensor = import->tensors()->Get(inputs[1]);
-  assert(tensor->type() == tflite::TensorType::TensorType_INT32);
-  const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-
-  if (buffer && buffer->data())
-  {
-    auto vec = extract_buffer<int32_t>(buffer);
-    import->set_tensor_filler(inputs[1], vec);
-  }
-}
-
-tflchef::Operation *TFliteOpResizeNearestNeighbor::build(const tflite::Operator *op,
-                                                         TFliteImport *import,
-                                                         tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_ResizeNearestNeighborOptions();
-  assert(op_params != nullptr);
-
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("ResizeNearestNeighbor");
-
-  auto op_options = operation->mutable_resize_nearest_neighbor_options();
-
-  op_options->set_align_corners(op_params->align_corners());
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/ResizeNearestNeighbor.h b/compiler/tflchef/tflite/src/Op/ResizeNearestNeighbor.h
deleted file mode 100644
index 5090bb938..000000000
--- a/compiler/tflchef/tflite/src/Op/ResizeNearestNeighbor.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_RESIZE_NEAREST_NEIGHBOR_H__
-#define __TFLITE_OP_RESIZE_NEAREST_NEIGHBOR_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for ResizeNearestNeighbor
- */
-class TFliteOpResizeNearestNeighbor : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_RESIZE_NEAREST_NEIGHBOR_H__
diff --git a/compiler/tflchef/tflite/src/Op/ReverseSequence.cpp b/compiler/tflchef/tflite/src/Op/ReverseSequence.cpp
deleted file mode 100644
index 6ef6c2326..000000000
--- a/compiler/tflchef/tflite/src/Op/ReverseSequence.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ReverseSequence.h"
-
-#include "Convert.h"
-#include "FillerHelper.h"
-
-namespace tflchef
-{
-
-void TFliteOpReverseSequence::filler(const tflite::Operator *op, TFliteImport *import,
-                                     tflchef::ModelRecipe *) const
-{
-  const std::vector<int32_t> &inputs = as_index_vector(op->inputs());
-  assert(inputs.size() == 2);
-
-  fill_tensor_to_import(inputs[1], import);
-}
-
-tflchef::Operation *TFliteOpReverseSequence::build(const tflite::Operator *op, TFliteImport *,
-                                                   tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("ReverseSequence");
-
-  auto op_params = op->builtin_options_as_ReverseSequenceOptions();
-
-  assert(op_params != nullptr);
-
-  auto op_options = operation->mutable_reverse_sequence_options();
-
-  op_options->set_seq_dim(op_params->seq_dim());
-  op_options->set_batch_dim(op_params->batch_dim());
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/ReverseSequence.h b/compiler/tflchef/tflite/src/Op/ReverseSequence.h
deleted file mode 100644
index 8c8c811e4..000000000
--- a/compiler/tflchef/tflite/src/Op/ReverseSequence.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_REVERSE_SEQUENCE_H__
-#define __TFLITE_OP_REVERSE_SEQUENCE_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for ReverseSequence
- */
-class TFliteOpReverseSequence : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_REVERSE_SEQUENCE_H__
diff --git a/compiler/tflchef/tflite/src/Op/ReverseV2.cpp b/compiler/tflchef/tflite/src/Op/ReverseV2.cpp
deleted file mode 100644
index c59d97574..000000000
--- a/compiler/tflchef/tflite/src/Op/ReverseV2.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ReverseV2.h"
-
-#include "Convert.h"
-#include "FillerHelper.h"
-
-namespace tflchef
-{
-
-void TFliteOpReverseV2::filler(const tflite::Operator *op, TFliteImport *import,
-                               tflchef::ModelRecipe *) const
-{
-  const std::vector<int32_t> &inputs = as_index_vector(op->inputs());
-  assert(inputs.size() == 2);
-
-  fill_tensor_to_import(inputs[1], import);
-}
-
-tflchef::Operation *TFliteOpReverseV2::build(const tflite::Operator *, TFliteImport *,
-                                             tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("ReverseV2");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/ReverseV2.h b/compiler/tflchef/tflite/src/Op/ReverseV2.h
deleted file mode 100644
index 6a8a75e6b..000000000
--- a/compiler/tflchef/tflite/src/Op/ReverseV2.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_REVERSEV2_H__
-#define __TFLITE_OP_REVERSEV2_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for ReverseV2
- */
-class TFliteOpReverseV2 : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_REVERSEV2_H__
diff --git a/compiler/tflchef/tflite/src/Op/Round.cpp b/compiler/tflchef/tflite/src/Op/Round.cpp
deleted file mode 100644
index c3f6bf6c4..000000000
--- a/compiler/tflchef/tflite/src/Op/Round.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Round.h"
-
-namespace tflchef
-{
-
-void TFliteOpRound::filler(const tflite::Operator *, TFliteImport *, tflchef::ModelRecipe *) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpRound::build(const tflite::Operator *, TFliteImport *,
-                                         tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Round");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Round.h b/compiler/tflchef/tflite/src/Op/Round.h
deleted file mode 100644
index df0da3fa1..000000000
--- a/compiler/tflchef/tflite/src/Op/Round.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_ROUND_H__
-#define __TFLITE_OP_ROUND_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Round
- */
-class TFliteOpRound : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_ROUND_H__
diff --git a/compiler/tflchef/tflite/src/Op/Rsqrt.cpp b/compiler/tflchef/tflite/src/Op/Rsqrt.cpp
deleted file mode 100644
index 1639214e4..000000000
--- a/compiler/tflchef/tflite/src/Op/Rsqrt.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Rsqrt.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpRsqrt::filler(const tflite::Operator *, TFliteImport *, tflchef::ModelRecipe *) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpRsqrt::build(const tflite::Operator *, TFliteImport *,
-                                         tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Rsqrt");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Rsqrt.h b/compiler/tflchef/tflite/src/Op/Rsqrt.h
deleted file mode 100644
index 5d68344c2..000000000
--- a/compiler/tflchef/tflite/src/Op/Rsqrt.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_RSQRT_H__
-#define __TFLITE_OP_RSQRT_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Rsqrt
- */
-class TFliteOpRsqrt : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_RSQRT_H__
diff --git a/compiler/tflchef/tflite/src/Op/ScatterNd.cpp b/compiler/tflchef/tflite/src/Op/ScatterNd.cpp
deleted file mode 100644
index 548a09a67..000000000
--- a/compiler/tflchef/tflite/src/Op/ScatterNd.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ScatterNd.h"
-
-#include "Convert.h"
-#include "FillerHelper.h"
-
-namespace tflchef
-{
-
-void TFliteOpScatterNd::filler(const tflite::Operator *op, TFliteImport *import,
-                               tflchef::ModelRecipe *model_recipe) const
-{
-  // Filler for indices and shape
-  fill_tensor_to_import(0, import);
-  fill_tensor_to_import(2, import);
-}
-
-tflchef::Operation *TFliteOpScatterNd::build(const tflite::Operator *, TFliteImport *,
-                                             tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("ScatterNd");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/ScatterNd.h b/compiler/tflchef/tflite/src/Op/ScatterNd.h
deleted file mode 100644
index 76362d775..000000000
--- a/compiler/tflchef/tflite/src/Op/ScatterNd.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_SCATTER_ND_H__
-#define __TFLITE_OP_SCATTER_ND_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for ScatterNd
- */
-class TFliteOpScatterNd : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_SCATTER_ND_H__
diff --git a/compiler/tflchef/tflite/src/Op/SegmentSum.cpp b/compiler/tflchef/tflite/src/Op/SegmentSum.cpp
deleted file mode 100644
index a975ca4b3..000000000
--- a/compiler/tflchef/tflite/src/Op/SegmentSum.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "SegmentSum.h"
-
-#include "FillerHelper.h"
-
-namespace tflchef
-{
-
-void TFliteOpSegmentSum::filler(const tflite::Operator *op, TFliteImport *import,
-                                tflchef::ModelRecipe *model_recipe) const
-{
-  // Filler for indices and shape
-  fill_tensor_to_import(1, import);
-}
-
-tflchef::Operation *TFliteOpSegmentSum::build(const tflite::Operator *op, TFliteImport *import,
-                                              tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("SegmentSum");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/SegmentSum.h b/compiler/tflchef/tflite/src/Op/SegmentSum.h
deleted file mode 100644
index d20e63bd7..000000000
--- a/compiler/tflchef/tflite/src/Op/SegmentSum.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_SEGMENT_SUM_H__
-#define __TFLITE_OP_SEGMENT_SUM_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for SEGMENT_SUM
- */
-class TFliteOpSegmentSum : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_SEGMENT_SUM_H__
diff --git a/compiler/tflchef/tflite/src/Op/Select.cpp b/compiler/tflchef/tflite/src/Op/Select.cpp
deleted file mode 100644
index 741ffb8f6..000000000
--- a/compiler/tflchef/tflite/src/Op/Select.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Select.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpSelect::filler(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpSelect::build(const tflite::Operator *op, TFliteImport *import,
-                                          tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Select");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Select.h b/compiler/tflchef/tflite/src/Op/Select.h
deleted file mode 100644
index bf8e57d78..000000000
--- a/compiler/tflchef/tflite/src/Op/Select.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_SELECT_H__
-#define __TFLITE_OP_SELECT_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for SELECT
- */
-class TFliteOpSelect : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_SELECT_H__
diff --git a/compiler/tflchef/tflite/src/Op/SelectV2.cpp b/compiler/tflchef/tflite/src/Op/SelectV2.cpp
deleted file mode 100644
index 0ddabb4be..000000000
--- a/compiler/tflchef/tflite/src/Op/SelectV2.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "SelectV2.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpSelectV2::filler(const tflite::Operator *op, TFliteImport *import,
-                              tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpSelectV2::build(const tflite::Operator *op, TFliteImport *import,
-                                            tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("SelectV2");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/SelectV2.h b/compiler/tflchef/tflite/src/Op/SelectV2.h
deleted file mode 100644
index ff03341d7..000000000
--- a/compiler/tflchef/tflite/src/Op/SelectV2.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_SELECT_V2_H__
-#define __TFLITE_OP_SELECT_V2_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for SELECT
- */
-class TFliteOpSelectV2 : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_SELECT_V2_H__
diff --git a/compiler/tflchef/tflite/src/Op/Shape.cpp b/compiler/tflchef/tflite/src/Op/Shape.cpp
deleted file mode 100644
index d6e490d63..000000000
--- a/compiler/tflchef/tflite/src/Op/Shape.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Shape.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpShape::filler(const tflite::Operator *op, TFliteImport *import,
-                           tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpShape::build(const tflite::Operator *op, TFliteImport *import,
-                                         tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-  operation->set_type("Shape");
-
-  auto op_params = op->builtin_options_as_ShapeOptions();
-  assert(op_params != nullptr);
-
-  auto op_options = operation->mutable_shape_options();
-  op_options->set_out_type(as_tflchef_type(op_params->out_type()));
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Shape.h b/compiler/tflchef/tflite/src/Op/Shape.h
deleted file mode 100644
index ebe1befb3..000000000
--- a/compiler/tflchef/tflite/src/Op/Shape.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_SHAPE_H__
-#define __TFLITE_OP_SHAPE_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for SHAPE
- */
-class TFliteOpShape : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_SHAPE_H__
diff --git a/compiler/tflchef/tflite/src/Op/Sin.cpp b/compiler/tflchef/tflite/src/Op/Sin.cpp
deleted file mode 100644
index 8c063f424..000000000
--- a/compiler/tflchef/tflite/src/Op/Sin.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Sin.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpSin::filler(const tflite::Operator *op, TFliteImport *import,
-                         tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpSin::build(const tflite::Operator *op, TFliteImport *import,
-                                       tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Sin");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Sin.h b/compiler/tflchef/tflite/src/Op/Sin.h
deleted file mode 100644
index 51eabceb5..000000000
--- a/compiler/tflchef/tflite/src/Op/Sin.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_SIN_H__
-#define __TFLITE_OP_SIN_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Sin
- */
-class TFliteOpSin : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_SIN_H__
diff --git a/compiler/tflchef/tflite/src/Op/Slice.cpp b/compiler/tflchef/tflite/src/Op/Slice.cpp
deleted file mode 100644
index f0c44da2d..000000000
--- a/compiler/tflchef/tflite/src/Op/Slice.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Slice.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpSlice::filler(const tflite::Operator *op, TFliteImport *import,
-                           tflchef::ModelRecipe *model_recipe) const
-{
-  const std::vector<int32_t> &inputs = as_index_vector(op->inputs());
-
-  // for begin and size
-  for (int32_t index = 1; index <= 2; ++index)
-  {
-    const tflite::Tensor *tensor = import->tensors()->Get(inputs[index]);
-    assert(tensor->type() == tflite::TensorType::TensorType_INT32);
-    const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-    auto vec = extract_buffer<int32_t>(buffer);
-    import->set_tensor_filler(inputs[index], vec);
-  }
-}
-
-tflchef::Operation *TFliteOpSlice::build(const tflite::Operator *op, TFliteImport *import,
-                                         tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Slice");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Slice.h b/compiler/tflchef/tflite/src/Op/Slice.h
deleted file mode 100644
index 6ca6724d3..000000000
--- a/compiler/tflchef/tflite/src/Op/Slice.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_SLICE_H__
-#define __TFLITE_OP_SLICE_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for SLICE
- */
-class TFliteOpSlice : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_SLICE_H__
diff --git a/compiler/tflchef/tflite/src/Op/Softmax.cpp b/compiler/tflchef/tflite/src/Op/Softmax.cpp
deleted file mode 100644
index 5b5c94f7e..000000000
--- a/compiler/tflchef/tflite/src/Op/Softmax.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Softmax.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpSoftmax::filler(const tflite::Operator *op, TFliteImport *import,
-                             tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpSoftmax::build(const tflite::Operator *op, TFliteImport *import,
-                                           tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_SoftmaxOptions();
-  assert(op_params != nullptr);
-
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Softmax");
-
-  auto op_options = operation->mutable_softmax_options();
-
-  op_options->set_beta(op_params->beta());
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Softmax.h b/compiler/tflchef/tflite/src/Op/Softmax.h
deleted file mode 100644
index cf168bdd9..000000000
--- a/compiler/tflchef/tflite/src/Op/Softmax.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_SOFTMAX_H__
-#define __TFLITE_OP_SOFTMAX_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Softmax
- */
-class TFliteOpSoftmax : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_SOFTMAX_H__
diff --git a/compiler/tflchef/tflite/src/Op/SpaceToBatchND.cpp b/compiler/tflchef/tflite/src/Op/SpaceToBatchND.cpp
deleted file mode 100644
index 9de0775a9..000000000
--- a/compiler/tflchef/tflite/src/Op/SpaceToBatchND.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "SpaceToBatchND.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpSpaceToBatchND::filler(const tflite::Operator *op, TFliteImport *import,
-                                    tflchef::ModelRecipe *model_recipe) const
-{
-  // filler for second, third input
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *tensor = import->tensors()->Get(inputs[1]);
-  assert(tensor->type() == tflite::TensorType::TensorType_INT32);
-  const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-  auto vec = extract_buffer<int32_t>(buffer);
-  import->set_tensor_filler(inputs[1], vec);
-
-  tensor = import->tensors()->Get(inputs[2]);
-  assert(tensor->type() == tflite::TensorType::TensorType_INT32);
-  buffer = import->buffers()->Get(tensor->buffer());
-  vec = extract_buffer<int32_t>(buffer);
-  import->set_tensor_filler(inputs[2], vec);
-}
-
-tflchef::Operation *TFliteOpSpaceToBatchND::build(const tflite::Operator *op, TFliteImport *import,
-                                                  tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("SpaceToBatchND");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/SpaceToBatchND.h b/compiler/tflchef/tflite/src/Op/SpaceToBatchND.h
deleted file mode 100644
index 9d7bc44e8..000000000
--- a/compiler/tflchef/tflite/src/Op/SpaceToBatchND.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_SPACETOBATCHND_H__
-#define __TFLITE_OP_SPACETOBATCHND_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for SpaceToBatchND
- */
-class TFliteOpSpaceToBatchND : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_SPACETOBATCHND_H__
diff --git a/compiler/tflchef/tflite/src/Op/SpaceToDepth.cpp b/compiler/tflchef/tflite/src/Op/SpaceToDepth.cpp
deleted file mode 100644
index e5718b515..000000000
--- a/compiler/tflchef/tflite/src/Op/SpaceToDepth.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "SpaceToDepth.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpSpaceToDepth::filler(const tflite::Operator *op, TFliteImport *import,
-                                  tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpSpaceToDepth::build(const tflite::Operator *op, TFliteImport *import,
-                                                tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("SpaceToDepth");
-
-  auto op_params = op->builtin_options_as_SpaceToDepthOptions();
-  assert(op_params != nullptr);
-
-  auto op_options = operation->mutable_space_to_depth_options();
-
-  op_options->set_block_size(op_params->block_size());
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/SpaceToDepth.h b/compiler/tflchef/tflite/src/Op/SpaceToDepth.h
deleted file mode 100644
index 784ad940a..000000000
--- a/compiler/tflchef/tflite/src/Op/SpaceToDepth.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_SPACETODEPTH_H__
-#define __TFLITE_OP_SPACETODEPTH_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for SpaceToDepth
- */
-class TFliteOpSpaceToDepth : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_SPACETODEPTH_H__
diff --git a/compiler/tflchef/tflite/src/Op/SparseToDense.cpp b/compiler/tflchef/tflite/src/Op/SparseToDense.cpp
deleted file mode 100644
index 9e4f0a067..000000000
--- a/compiler/tflchef/tflite/src/Op/SparseToDense.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "SparseToDense.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpSparseToDense::filler(const tflite::Operator *op, TFliteImport *import,
-                                   tflchef::ModelRecipe *model_recipe) const
-{
-  // filler for Shape
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *output_shape_tensor = import->tensors()->Get(inputs[1]);
-  assert(output_shape_tensor->type() == tflite::TensorType::TensorType_INT32);
-  const tflite::Buffer *buffer = import->buffers()->Get(output_shape_tensor->buffer());
-  auto vec = extract_buffer<int32_t>(buffer);
-  import->set_tensor_filler(inputs[1], vec);
-}
-
-tflchef::Operation *TFliteOpSparseToDense::build(const tflite::Operator *op, TFliteImport *import,
-                                                 tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_SparseToDenseOptions();
-  assert(op_params != nullptr);
-
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("SparseToDense");
-
-  auto op_options = operation->mutable_sparse_to_dense_options();
-
-  op_options->set_validate_indices(op_params->validate_indices());
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/SparseToDense.h b/compiler/tflchef/tflite/src/Op/SparseToDense.h
deleted file mode 100644
index 5ffe4789d..000000000
--- a/compiler/tflchef/tflite/src/Op/SparseToDense.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_SPARSETODENSE_H__
-#define __TFLITE_OP_SPARSETODENSE_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for SparseToDense
- */
-class TFliteOpSparseToDense : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_SPARSETODENSE_H__
diff --git a/compiler/tflchef/tflite/src/Op/Split.cpp b/compiler/tflchef/tflite/src/Op/Split.cpp
deleted file mode 100644
index 49f9aa2c6..000000000
--- a/compiler/tflchef/tflite/src/Op/Split.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Split.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpSplit::filler(const tflite::Operator *op, TFliteImport *import,
-                           tflchef::ModelRecipe *model_recipe) const
-{
-  const auto &inputs = *op->inputs();
-
-  // for input split_dim
-  // NOTE unlike other Ops, Split input 0 is split_dim
-  const tflite::Tensor *tensor = import->tensors()->Get(inputs[0]);
-  assert(tensor->type() == tflite::TensorType::TensorType_INT32);
-  const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-  auto vec = extract_buffer<int32_t>(buffer);
-  import->set_tensor_filler(inputs[0], vec);
-}
-
-tflchef::Operation *TFliteOpSplit::build(const tflite::Operator *op, TFliteImport *import,
-                                         tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Split");
-
-  auto op_options = operation->mutable_split_options();
-
-  auto op_params = op->builtin_options_as_SplitOptions();
-  assert(op_params != nullptr);
-
-  op_options->set_num_splits(op_params->num_splits());
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Split.h b/compiler/tflchef/tflite/src/Op/Split.h
deleted file mode 100644
index af247a1b9..000000000
--- a/compiler/tflchef/tflite/src/Op/Split.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_SPLIT_H__
-#define __TFLITE_OP_SPLIT_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for SPLIT
- */
-class TFliteOpSplit : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_SPLIT_H__
diff --git a/compiler/tflchef/tflite/src/Op/SplitV.cpp b/compiler/tflchef/tflite/src/Op/SplitV.cpp
deleted file mode 100644
index 18035e6f4..000000000
--- a/compiler/tflchef/tflite/src/Op/SplitV.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "SplitV.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpSplitV::filler(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const
-{
-  const auto &inputs = *op->inputs();
-
-  // for input "size_splits" and "split_dim"
-  for (int32_t idx = 1; idx <= 2; idx++)
-  {
-    const tflite::Tensor *tensor = import->tensors()->Get(inputs[idx]);
-    assert(tensor->type() == tflite::TensorType::TensorType_INT32);
-    const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-    auto vec = extract_buffer<int32_t>(buffer);
-    import->set_tensor_filler(inputs[idx], vec);
-  }
-}
-
-tflchef::Operation *TFliteOpSplitV::build(const tflite::Operator *op, TFliteImport *import,
-                                          tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("SplitV");
-
-  auto op_options = operation->mutable_split_v_options();
-
-  auto op_params = op->builtin_options_as_SplitVOptions();
-  assert(op_params != nullptr);
-
-  op_options->set_num_splits(op_params->num_splits());
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/SplitV.h b/compiler/tflchef/tflite/src/Op/SplitV.h
deleted file mode 100644
index 3f715b5f9..000000000
--- a/compiler/tflchef/tflite/src/Op/SplitV.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_SPLIT_V_H__
-#define __TFLITE_OP_SPLIT_V_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for SPLIT_V
- */
-class TFliteOpSplitV : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_SPLIT_V_H__
diff --git a/compiler/tflchef/tflite/src/Op/Sqrt.cpp b/compiler/tflchef/tflite/src/Op/Sqrt.cpp
index dd6bfcab0..5d967d66f 100644
--- a/compiler/tflchef/tflite/src/Op/Sqrt.cpp
+++ b/compiler/tflchef/tflite/src/Op/Sqrt.cpp
@@ -25,19 +25,6 @@ void TFliteOpSqrt::filler(const tflite::Operator *op, TFliteImport *import,
                           tflchef::ModelRecipe *model_recipe) const
 {
   // Nothing to do with filler
-  // But input has filler for constant inputs
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *tensor = import->tensors()->Get(inputs[0]);
-  if (tensor->type() == tflite::TensorType::TensorType_FLOAT32)
-  {
-    const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-    if (buffer && buffer->data())
-    {
-      auto vec = extract_buffer<float>(buffer);
-      import->set_tensor_filler(inputs[0], vec);
-    }
-  }
 }
 
 tflchef::Operation *TFliteOpSqrt::build(const tflite::Operator *op, TFliteImport *import,
diff --git a/compiler/tflchef/tflite/src/Op/Square.cpp b/compiler/tflchef/tflite/src/Op/Square.cpp
deleted file mode 100644
index d3803284a..000000000
--- a/compiler/tflchef/tflite/src/Op/Square.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Square.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpSquare::filler(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpSquare::build(const tflite::Operator *op, TFliteImport *import,
-                                          tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Square");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Square.h b/compiler/tflchef/tflite/src/Op/Square.h
deleted file mode 100644
index 9c008fe52..000000000
--- a/compiler/tflchef/tflite/src/Op/Square.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_SQUARE_H__
-#define __TFLITE_OP_SQUARE_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Square
- */
-class TFliteOpSquare : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_SQUARE_H__
diff --git a/compiler/tflchef/tflite/src/Op/SquaredDifference.cpp b/compiler/tflchef/tflite/src/Op/SquaredDifference.cpp
deleted file mode 100644
index 1ee536e76..000000000
--- a/compiler/tflchef/tflite/src/Op/SquaredDifference.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "SquaredDifference.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpSquaredDifference::filler(const tflite::Operator *op, TFliteImport *import,
-                                       tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpSquaredDifference::build(const tflite::Operator *op,
-                                                     TFliteImport *import,
-                                                     tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("SquaredDifference");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/SquaredDifference.h b/compiler/tflchef/tflite/src/Op/SquaredDifference.h
deleted file mode 100644
index 58c2ed460..000000000
--- a/compiler/tflchef/tflite/src/Op/SquaredDifference.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_SQUAREDDIFFERENCE_H__
-#define __TFLITE_OP_SQUAREDDIFFERENCE_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for SquaredDifference
- */
-class TFliteOpSquaredDifference : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_SQUAREDDIFFERENCE_H__
diff --git a/compiler/tflchef/tflite/src/Op/Squeeze.cpp b/compiler/tflchef/tflite/src/Op/Squeeze.cpp
deleted file mode 100644
index 7983fc62a..000000000
--- a/compiler/tflchef/tflite/src/Op/Squeeze.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Squeeze.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpSqueeze::filler(const tflite::Operator *op, TFliteImport *import,
-                             tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpSqueeze::build(const tflite::Operator *op, TFliteImport *import,
-                                           tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_SqueezeOptions();
-  assert(op_params != nullptr);
-
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Squeeze");
-
-  auto op_options = operation->mutable_squeeze_options();
-
-  std::vector<int32_t> squeeze_dims = as_index_vector(op_params->squeeze_dims());
-
-  for (auto dim : squeeze_dims)
-  {
-    op_options->add_squeeze_dim(dim);
-  }
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Squeeze.h b/compiler/tflchef/tflite/src/Op/Squeeze.h
deleted file mode 100644
index b6c89f73d..000000000
--- a/compiler/tflchef/tflite/src/Op/Squeeze.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_SQUEEZE_H__
-#define __TFLITE_OP_SQUEEZE_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Squeeze
- */
-class TFliteOpSqueeze : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_SQUEEZE_H__
diff --git a/compiler/tflchef/tflite/src/Op/StridedSlice.cpp b/compiler/tflchef/tflite/src/Op/StridedSlice.cpp
deleted file mode 100644
index c770236c7..000000000
--- a/compiler/tflchef/tflite/src/Op/StridedSlice.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "StridedSlice.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpStridedSlice::filler(const tflite::Operator *op, TFliteImport *import,
-                                  tflchef::ModelRecipe *model_recipe) const
-{
-  const std::vector<int32_t> &inputs = as_index_vector(op->inputs());
-
-  // for begin, end and strides
-  for (int32_t index = 1; index <= 3; ++index)
-  {
-    const tflite::Tensor *tensor = import->tensors()->Get(inputs[index]);
-    assert(tensor->type() == tflite::TensorType::TensorType_INT32);
-    const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-    auto vec = extract_buffer<int32_t>(buffer);
-    import->set_tensor_filler(inputs[index], vec);
-  }
-}
-
-tflchef::Operation *TFliteOpStridedSlice::build(const tflite::Operator *op, TFliteImport *import,
-                                                tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_StridedSliceOptions();
-  assert(op_params != nullptr);
-
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("StridedSlice");
-
-  auto op_options = operation->mutable_strided_slice_options();
-
-  op_options->set_begin_mask(op_params->begin_mask());
-  op_options->set_end_mask(op_params->end_mask());
-  op_options->set_ellipsis_mask(op_params->ellipsis_mask());
-  op_options->set_new_axis_mask(op_params->new_axis_mask());
-  op_options->set_shrink_axis_mask(op_params->shrink_axis_mask());
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/StridedSlice.h b/compiler/tflchef/tflite/src/Op/StridedSlice.h
deleted file mode 100644
index 98054b9b9..000000000
--- a/compiler/tflchef/tflite/src/Op/StridedSlice.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_STRIDEDSLICE_H__
-#define __TFLITE_OP_STRIDEDSLICE_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for StridedSlice
- */
-class TFliteOpStridedSlice : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_STRIDEDSLICE_H__
diff --git a/compiler/tflchef/tflite/src/Op/Sub.cpp b/compiler/tflchef/tflite/src/Op/Sub.cpp
index 0a08bbfdf..db77fddf7 100644
--- a/compiler/tflchef/tflite/src/Op/Sub.cpp
+++ b/compiler/tflchef/tflite/src/Op/Sub.cpp
@@ -17,7 +17,6 @@
 #include "Sub.h"
 
 #include "Convert.h"
-#include "FillerHelper.h"
 
 namespace tflchef
 {
@@ -25,13 +24,7 @@ namespace tflchef
 void TFliteOpSub::filler(const tflite::Operator *op, TFliteImport *import,
                          tflchef::ModelRecipe *model_recipe) const
 {
-  // Sub may have constant input
-
-  const std::vector<int32_t> &inputs = as_index_vector(op->inputs());
-  assert(inputs.size() == 2);
-
-  fill_tensor_to_import(inputs[0], import);
-  fill_tensor_to_import(inputs[1], import);
+  // Nothing to do with filler
 }
 
 tflchef::Operation *TFliteOpSub::build(const tflite::Operator *op, TFliteImport *import,
diff --git a/compiler/tflchef/tflite/src/Op/Sum.cpp b/compiler/tflchef/tflite/src/Op/Sum.cpp
deleted file mode 100644
index 9f3133e85..000000000
--- a/compiler/tflchef/tflite/src/Op/Sum.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Sum.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpSum::filler(const tflite::Operator *op, TFliteImport *import,
-                         tflchef::ModelRecipe *model_recipe) const
-{
-  // filler for second input
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *tensor = import->tensors()->Get(inputs[1]);
-  assert(tensor->type() == tflite::TensorType::TensorType_INT32);
-  const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-  auto vec = extract_buffer<int32_t>(buffer);
-  import->set_tensor_filler(inputs[1], vec);
-}
-
-tflchef::Operation *TFliteOpSum::build(const tflite::Operator *op, TFliteImport *import,
-                                       tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_ReducerOptions();
-  assert(op_params != nullptr);
-
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Sum");
-
-  auto op_options = operation->mutable_sum_options();
-
-  op_options->set_keep_dims(op_params->keep_dims());
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Sum.h b/compiler/tflchef/tflite/src/Op/Sum.h
deleted file mode 100644
index 38eeb080d..000000000
--- a/compiler/tflchef/tflite/src/Op/Sum.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_SUM_H__
-#define __TFLITE_OP_SUM_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for sum
- */
-class TFliteOpSum : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_SUM_H__
diff --git a/compiler/tflchef/tflite/src/Op/Tanh.cpp b/compiler/tflchef/tflite/src/Op/Tanh.cpp
deleted file mode 100644
index cab8ca460..000000000
--- a/compiler/tflchef/tflite/src/Op/Tanh.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Tanh.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpTanh::filler(const tflite::Operator *, TFliteImport *, tflchef::ModelRecipe *) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpTanh::build(const tflite::Operator *, TFliteImport *,
-                                        tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Tanh");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Tanh.h b/compiler/tflchef/tflite/src/Op/Tanh.h
deleted file mode 100644
index 7339e4103..000000000
--- a/compiler/tflchef/tflite/src/Op/Tanh.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_TANH_H__
-#define __TFLITE_OP_TANH_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Tanh
- */
-class TFliteOpTanh : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_TANH_H__
diff --git a/compiler/tflchef/tflite/src/Op/Tile.cpp b/compiler/tflchef/tflite/src/Op/Tile.cpp
deleted file mode 100644
index 14e65131c..000000000
--- a/compiler/tflchef/tflite/src/Op/Tile.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Tile.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpTile::filler(const tflite::Operator *op, TFliteImport *import,
-                          tflchef::ModelRecipe *model_recipe) const
-{
-  // filler for second input
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *tensor = import->tensors()->Get(inputs[1]);
-  assert(tensor->type() == tflite::TensorType::TensorType_INT32 ||
-         tensor->type() == tflite::TensorType::TensorType_INT64);
-  const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-  auto vec = extract_buffer<int32_t>(buffer);
-  import->set_tensor_filler(inputs[1], vec);
-}
-
-tflchef::Operation *TFliteOpTile::build(const tflite::Operator *op, TFliteImport *import,
-                                        tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Tile");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Tile.h b/compiler/tflchef/tflite/src/Op/Tile.h
deleted file mode 100644
index 640f52a1f..000000000
--- a/compiler/tflchef/tflite/src/Op/Tile.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_TILE_H__
-#define __TFLITE_OP_TILE_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Tile
- */
-class TFliteOpTile : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_TILE_H__
diff --git a/compiler/tflchef/tflite/src/Op/TopKV2.cpp b/compiler/tflchef/tflite/src/Op/TopKV2.cpp
deleted file mode 100644
index 461456ae2..000000000
--- a/compiler/tflchef/tflite/src/Op/TopKV2.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "TopKV2.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpTopKV2::filler(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const
-{
-  // filler for second input
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *tensor = import->tensors()->Get(inputs[1]);
-  assert(tensor->type() == tflite::TensorType::TensorType_INT32 ||
-         tensor->type() == tflite::TensorType::TensorType_INT64);
-  const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-  auto vec = extract_buffer<int32_t>(buffer);
-  import->set_tensor_filler(inputs[1], vec);
-}
-
-tflchef::Operation *TFliteOpTopKV2::build(const tflite::Operator *op, TFliteImport *import,
-                                          tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("TopKV2");
-
-  // NOTE there is `sorted` attribute in TF but it's always true for TFlite
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/TopKV2.h b/compiler/tflchef/tflite/src/Op/TopKV2.h
deleted file mode 100644
index b2b74cc75..000000000
--- a/compiler/tflchef/tflite/src/Op/TopKV2.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_TOPK_V2_H__
-#define __TFLITE_OP_TOPK_V2_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for TOPK_V2
- */
-class TFliteOpTopKV2 : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_TOPK_V2_H__
diff --git a/compiler/tflchef/tflite/src/Op/Transpose.cpp b/compiler/tflchef/tflite/src/Op/Transpose.cpp
deleted file mode 100644
index a997bb08e..000000000
--- a/compiler/tflchef/tflite/src/Op/Transpose.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Transpose.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpTranspose::filler(const tflite::Operator *op, TFliteImport *import,
-                               tflchef::ModelRecipe *model_recipe) const
-{
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *perm_tensor = import->tensors()->Get(inputs[1]);
-  assert(perm_tensor->type() == tflite::TensorType::TensorType_INT32);
-  const tflite::Buffer *buffer = import->buffers()->Get(perm_tensor->buffer());
-  auto vec = extract_buffer<int32_t>(buffer);
-  import->set_tensor_filler(inputs[1], vec);
-}
-
-tflchef::Operation *TFliteOpTranspose::build(const tflite::Operator *op, TFliteImport *import,
-                                             tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Transpose");
-
-  // No options for Transpose
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Transpose.h b/compiler/tflchef/tflite/src/Op/Transpose.h
deleted file mode 100644
index f0d944b6b..000000000
--- a/compiler/tflchef/tflite/src/Op/Transpose.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_TRANSPOSE_H__
-#define __TFLITE_OP_TRANSPOSE_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Transpose
- */
-class TFliteOpTranspose : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_TRANSPOSE_H__
diff --git a/compiler/tflchef/tflite/src/Op/TransposeConv.cpp b/compiler/tflchef/tflite/src/Op/TransposeConv.cpp
deleted file mode 100644
index 4e7adf6c6..000000000
--- a/compiler/tflchef/tflite/src/Op/TransposeConv.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "TransposeConv.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpTransposeConv::filler(const tflite::Operator *op, TFliteImport *import,
-                                   tflchef::ModelRecipe *model_recipe) const
-{
-  const auto &inputs = *op->inputs();
-
-  const tflite::Tensor *tensor = import->tensors()->Get(inputs[0]);
-  assert(tensor->type() == tflite::TensorType::TensorType_INT32);
-  const tflite::Buffer *buffer = import->buffers()->Get(tensor->buffer());
-
-  if (buffer && buffer->data())
-  {
-    auto vec = extract_buffer<int32_t>(buffer);
-    import->set_tensor_filler(inputs[0], vec);
-  }
-
-  // filter
-  const tflite::Tensor *filter_tensor = import->tensors()->Get(inputs[1]);
-  import->set_tensor_filler(inputs[1]);
-}
-
-tflchef::Operation *TFliteOpTransposeConv::build(const tflite::Operator *op, TFliteImport *import,
-                                                 tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_TransposeConvOptions();
-
-  assert(op_params != nullptr);
-
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("TransposeConv");
-
-  auto op_options = operation->mutable_transpose_conv_options();
-
-  op_options->set_stride_h(op_params->stride_h());
-  op_options->set_stride_w(op_params->stride_w());
-  op_options->set_padding(as_tflchef_padding(op_params->padding()));
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/TransposeConv.h b/compiler/tflchef/tflite/src/Op/TransposeConv.h
deleted file mode 100644
index c79cdabd2..000000000
--- a/compiler/tflchef/tflite/src/Op/TransposeConv.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_TRANSPOSE_CONV_H__
-#define __TFLITE_OP_TRANSPOSE_CONV_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for TransposeConv
- */
-class TFliteOpTransposeConv : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_TRANSPOSE_CONV_H__
diff --git a/compiler/tflchef/tflite/src/Op/UnidirectionalSequenceLSTM.cpp b/compiler/tflchef/tflite/src/Op/UnidirectionalSequenceLSTM.cpp
deleted file mode 100644
index c2c79285b..000000000
--- a/compiler/tflchef/tflite/src/Op/UnidirectionalSequenceLSTM.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "UnidirectionalSequenceLSTM.h"
-
-#include "Convert.h"
-#include "FillerHelper.h"
-
-namespace tflchef
-{
-
-void TFliteOpUnidirectionalSequenceLSTM::filler(const tflite::Operator *op, TFliteImport *import,
-                                                tflchef::ModelRecipe *model_recipe) const
-{
-  const std::vector<int32_t> &inputs = as_index_vector(op->inputs());
-  assert(inputs.size() == 24);
-
-  for (int32_t i = 0; i < inputs.size(); i++)
-  {
-    // Except for Input 0, 17 and 18.
-    // Each Input mean Input[0](=Input Tensor), Input[17](=OutputState Tensor) and
-    // Input[18](=CellState Tensor).
-    // This could be updated from previous input or User Given data, so This could not be Const
-    if (i == 0 || i == 17 || i == 18)
-      continue;
-    if (inputs[i] != -1)
-      fill_tensor_to_import(inputs[i], import);
-  }
-}
-
-tflchef::Operation *
-TFliteOpUnidirectionalSequenceLSTM::build(const tflite::Operator *op, TFliteImport *import,
-                                          tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_UnidirectionalSequenceLSTMOptions();
-  assert(op_params != nullptr);
-
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("UnidirectionalSequenceLSTM");
-
-  auto op_options = operation->mutable_unidirectional_sequence_lstm_options();
-
-  op_options->set_activation(as_tflchef_activation(op_params->fused_activation_function()));
-  op_options->set_cell_clip(op_params->cell_clip());
-  op_options->set_proj_clip(op_params->proj_clip());
-  op_options->set_time_major(op_params->time_major());
-  op_options->set_asymmetric_quantize_inputs(op_params->asymmetric_quantize_inputs());
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/UnidirectionalSequenceLSTM.h b/compiler/tflchef/tflite/src/Op/UnidirectionalSequenceLSTM.h
deleted file mode 100644
index cc4e5fb0f..000000000
--- a/compiler/tflchef/tflite/src/Op/UnidirectionalSequenceLSTM.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_UNIDIRECTIONALSEQUENCELSTM_H__
-#define __TFLITE_OP_UNIDIRECTIONALSEQUENCELSTM_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for UnidirectionalSequenceLSTM
- */
-class TFliteOpUnidirectionalSequenceLSTM : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_UNIDIRECTIONALSEQUENCELSTM_H__
diff --git a/compiler/tflchef/tflite/src/Op/Unique.cpp b/compiler/tflchef/tflite/src/Op/Unique.cpp
deleted file mode 100644
index e3f77f40e..000000000
--- a/compiler/tflchef/tflite/src/Op/Unique.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Unique.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpUnique::filler(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpUnique::build(const tflite::Operator *op, TFliteImport *import,
-                                          tflchef::ModelRecipe *model_recipe) const
-{
-  auto op_params = op->builtin_options_as_UniqueOptions();
-  assert(op_params != nullptr);
-
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Unique");
-
-  auto op_options = operation->mutable_unique_options();
-
-  op_options->set_idx_out_type(as_tflchef_type(op_params->idx_out_type()));
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Unique.h b/compiler/tflchef/tflite/src/Op/Unique.h
deleted file mode 100644
index fae037c9f..000000000
--- a/compiler/tflchef/tflite/src/Op/Unique.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_UNIQUE_H__
-#define __TFLITE_OP_UNIQUE_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Unique
- */
-class TFliteOpUnique : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_UNIQUE_H__
diff --git a/compiler/tflchef/tflite/src/Op/Unpack.cpp b/compiler/tflchef/tflite/src/Op/Unpack.cpp
deleted file mode 100644
index a51ef84ef..000000000
--- a/compiler/tflchef/tflite/src/Op/Unpack.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Unpack.h"
-
-namespace tflchef
-{
-
-void TFliteOpUnpack::filler(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with filler
-}
-
-tflchef::Operation *TFliteOpUnpack::build(const tflite::Operator *op, TFliteImport *import,
-                                          tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-
-  operation->set_type("Unpack");
-
-  auto op_params = op->builtin_options_as_UnpackOptions();
-  assert(op_params != nullptr);
-
-  auto op_options = operation->mutable_unpack_options();
-  op_options->set_num(op_params->num());
-  op_options->set_axis(op_params->axis());
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Unpack.h b/compiler/tflchef/tflite/src/Op/Unpack.h
deleted file mode 100644
index 1036bdc14..000000000
--- a/compiler/tflchef/tflite/src/Op/Unpack.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_UNPACK_H__
-#define __TFLITE_OP_UNPACK_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Unpack
- */
-class TFliteOpUnpack : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_UNPACK_H__
diff --git a/compiler/tflchef/tflite/src/Op/Where.cpp b/compiler/tflchef/tflite/src/Op/Where.cpp
deleted file mode 100644
index e42de3737..000000000
--- a/compiler/tflchef/tflite/src/Op/Where.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "Where.h"
-
-namespace tflchef
-{
-
-void TFliteOpWhere::filler(const tflite::Operator *, TFliteImport *, tflchef::ModelRecipe *) const
-{
-  // Nothing to do with fillers here
-}
-
-tflchef::Operation *TFliteOpWhere::build(const tflite::Operator *, TFliteImport *,
-                                         tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-  operation->set_type("Where");
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/Where.h b/compiler/tflchef/tflite/src/Op/Where.h
deleted file mode 100644
index 00cdc4b00..000000000
--- a/compiler/tflchef/tflite/src/Op/Where.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_WHERE_H__
-#define __TFLITE_OP_WHERE_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for Where
- */
-class TFliteOpWhere : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_WHERE_H__
diff --git a/compiler/tflchef/tflite/src/Op/ZerosLike.cpp b/compiler/tflchef/tflite/src/Op/ZerosLike.cpp
deleted file mode 100644
index a56b6bdfb..000000000
--- a/compiler/tflchef/tflite/src/Op/ZerosLike.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ZerosLike.h"
-
-#include "Convert.h"
-
-namespace tflchef
-{
-
-void TFliteOpZerosLike::filler(const tflite::Operator *op, TFliteImport *import,
-                               tflchef::ModelRecipe *model_recipe) const
-{
-  // Nothing to do with fillers here
-}
-
-tflchef::Operation *TFliteOpZerosLike::build(const tflite::Operator *op, TFliteImport *,
-                                             tflchef::ModelRecipe *model_recipe) const
-{
-  auto operation = model_recipe->add_operation();
-  operation->set_type("ZerosLike");
-
-  auto op_options = operation->mutable_zeros_like_options();
-  (void)op_options;
-
-  return operation;
-}
-
-} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/Op/ZerosLike.h b/compiler/tflchef/tflite/src/Op/ZerosLike.h
deleted file mode 100644
index 163c1fa21..000000000
--- a/compiler/tflchef/tflite/src/Op/ZerosLike.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFLITE_OP_ZEROS_LIKE_H__
-#define __TFLITE_OP_ZEROS_LIKE_H__
-
-#include "TFliteOpChef.h"
-
-namespace tflchef
-{
-
-/**
- * @brief tflchef operator builder for ZerosLike
- */
-class TFliteOpZerosLike : public TFliteOpChef
-{
-public:
-  void filler(const tflite::Operator *op, TFliteImport *import,
-              tflchef::ModelRecipe *model_recipe) const override;
-  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
-                            tflchef::ModelRecipe *model_recipe) const override;
-};
-
-} // namespace tflchef
-
-#endif // __TFLITE_OP_ZEROS_LIKE_H__
diff --git a/compiler/tflchef/tflite/src/RawModelLoader.cpp b/compiler/tflchef/tflite/src/RawModelLoader.cpp
new file mode 100644
index 000000000..e9ef8ec8b
--- /dev/null
+++ b/compiler/tflchef/tflite/src/RawModelLoader.cpp
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <tflchef/RawModel.h>
+
+#include <cwrap/Fildes.h>
+
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+
+namespace
+{
+
+class MemoryMappedRawModel final : public tflchef::RawModel
+{
+public:
+  /**
+   * @require fd and data SHOULD be valid
+   */
+  explicit MemoryMappedRawModel(int fd, void *data, size_t size) : _fd{fd}, _data{data}, _size{size}
+  {
+    // DO NOTHING
+  }
+
+public:
+  ~MemoryMappedRawModel()
+  {
+    munmap(_data, _size);
+    close(_fd);
+  }
+
+public:
+  MemoryMappedRawModel(const MemoryMappedRawModel &) = delete;
+  MemoryMappedRawModel(MemoryMappedRawModel &&) = delete;
+
+public:
+  const ::tflite::Model *model(void) const override { return ::tflite::GetModel(_data); }
+
+private:
+  int _fd = -1;
+  void *_data = nullptr;
+  size_t _size = 0;
+};
+
+} // namespace
+
+namespace tflchef
+{
+
+std::unique_ptr<RawModel> load_tflite(const std::string &path)
+{
+  cwrap::Fildes fildes{open(path.c_str(), O_RDONLY)};
+
+  if (fildes.get() == -1)
+  {
+    // Return nullptr on open failure
+    return nullptr;
+  }
+
+  struct stat st;
+  if (fstat(fildes.get(), &st) == -1)
+  {
+    // Return nullptr on fstat failure
+    return nullptr;
+  }
+
+  auto size = st.st_size;
+  auto data = mmap(nullptr, size, PROT_READ, MAP_SHARED, fildes.get(), 0);
+
+  if (data == MAP_FAILED)
+  {
+    // Return nullptr on mmap failure
+    return nullptr;
+  }
+
+  return std::unique_ptr<tflchef::RawModel>{new MemoryMappedRawModel(fildes.release(), data, size)};
+}
+
+} // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/RecipeChef.cpp b/compiler/tflchef/tflite/src/RecipeChef.cpp
index 32ac9c3f3..0a26ae066 100644
--- a/compiler/tflchef/tflite/src/RecipeChef.cpp
+++ b/compiler/tflchef/tflite/src/RecipeChef.cpp
@@ -35,16 +35,9 @@ void set_inputs(TFliteImport *import, tflchef::Operation *operation, const tflit
 
   for (auto input : inputs)
   {
-    if (input == -1)
-    {
-      operation->add_input("");
-    }
-    else
-    {
-      auto tensor = tensors->Get(input);
-      std::string name = tensor_name(tensor);
-      operation->add_input(name);
-    }
+    auto tensor = tensors->Get(input);
+    std::string name = tensor_name(tensor);
+    operation->add_input(name);
   }
 }
 
@@ -110,21 +103,16 @@ std::unique_ptr<ModelRecipe> generate_recipe(const tflite::Model *model)
 
     operand->set_name(tensor_name(tensor));
     operand->set_type(as_tflchef_type(tensor->type()));
-    operand->set_is_variable(tensor->is_variable());
 
-    if (tensor->shape())
+    std::vector<int32_t> dims = as_index_vector(tensor->shape());
+    ::tflchef::TensorShape *shape = operand->mutable_shape();
+    for (auto dim : dims)
     {
-      std::vector<int32_t> dims = as_index_vector(tensor->shape());
-      ::tflchef::TensorShape *shape = operand->mutable_shape();
-      for (auto dim : dims)
-      {
-        shape->add_dim(dim);
-      }
+      shape->add_dim(dim);
     }
 
     // filler for weights, bias and so on
     std::vector<int32_t> expvalues;
-    std::vector<float> expfvalues;
     if (tflite_import.get_tensor_filler(i))
     {
       tflchef::TensorFiller *filler = operand->mutable_filler();
@@ -144,17 +132,6 @@ std::unique_ptr<ModelRecipe> generate_recipe(const tflite::Model *model)
         filler->add_arg(ss.str());
       }
     }
-    else if (tflite_import.get_tensor_filler(i, expfvalues))
-    {
-      tflchef::TensorFiller *filler = operand->mutable_filler();
-      filler->set_tag("explicit");
-      for (auto value : expfvalues)
-      {
-        std::ostringstream ss;
-        ss << value;
-        filler->add_arg(ss.str());
-      }
-    }
 
     auto quant = tensor->quantization();
     if (quant != nullptr)
@@ -185,91 +162,6 @@ std::unique_ptr<ModelRecipe> generate_recipe(const tflite::Model *model)
         for (uint32_t idx = 0; idx < quant->zero_point()->size(); ++idx)
           chef_quant->add_zero_point(quant->zero_point()->Get(idx));
       }
-      tflchef::TensorQuantization *chef_quant = operand->mutable_quant();
-      chef_quant->set_quantized_dimension(quant->quantized_dimension());
-    }
-
-    auto sparsity = tensor->sparsity();
-    if (sparsity != nullptr)
-    {
-      tflchef::TensorSparsity *chef_sparsity = operand->mutable_sparsity();
-      // traversal_order
-      auto chef_traversal_order = chef_sparsity->mutable_traversal_order();
-      for (const auto &to : *(sparsity->traversal_order()))
-      {
-        chef_traversal_order->add_dim(to);
-      }
-      // block_map
-      auto chef_block_map = chef_sparsity->mutable_block_map();
-      for (const auto &bm : *(sparsity->block_map()))
-      {
-        chef_block_map->add_dim(bm);
-      }
-      // dim_metadata
-      for (const auto &dm : *(sparsity->dim_metadata()))
-      {
-        auto chef_dm = chef_sparsity->add_dim_metadata();
-        // format
-        chef_dm->set_format(as_tflchef_sparse_dim_type(dm->format()));
-        // dense_size
-        chef_dm->set_dense_size(dm->dense_size());
-        // array_segments
-        auto chef_array_segments = chef_dm->mutable_array_segments();
-        switch (dm->array_segments_type())
-        {
-          case tflite::SparseIndexVector_NONE:
-            // DO NOTHING
-            break;
-          case tflite::SparseIndexVector_Int32Vector:
-            for (const auto &as : *(dm->array_segments_as_Int32Vector()->values()))
-            {
-              chef_array_segments->add_dim(as);
-            }
-            break;
-          case tflite::SparseIndexVector_Uint16Vector:
-            for (const auto &as : *(dm->array_segments_as_Uint16Vector()->values()))
-            {
-              chef_array_segments->add_dim(as);
-            }
-            break;
-          case tflite::SparseIndexVector_Uint8Vector:
-            for (const auto &as : *(dm->array_segments_as_Uint8Vector()->values()))
-            {
-              chef_array_segments->add_dim(as);
-            }
-            break;
-          default:
-            throw std::runtime_error("unsupported sparse index vector type");
-        }
-        // array_indices
-        auto chef_array_indices = chef_dm->mutable_array_indices();
-        switch (dm->array_indices_type())
-        {
-          case tflite::SparseIndexVector_NONE:
-            // DO NOTHING
-            break;
-          case tflite::SparseIndexVector_Int32Vector:
-            for (const auto &as : *(dm->array_indices_as_Int32Vector()->values()))
-            {
-              chef_array_indices->add_dim(as);
-            }
-            break;
-          case tflite::SparseIndexVector_Uint16Vector:
-            for (const auto &as : *(dm->array_indices_as_Uint16Vector()->values()))
-            {
-              chef_array_indices->add_dim(as);
-            }
-            break;
-          case tflite::SparseIndexVector_Uint8Vector:
-            for (const auto &as : *(dm->array_indices_as_Uint8Vector()->values()))
-            {
-              chef_array_indices->add_dim(as);
-            }
-            break;
-          default:
-            throw std::runtime_error("unsupported sparse index vector type");
-        }
-      }
     }
   }
 
diff --git a/compiler/tflchef/tflite/src/TFliteImport.h b/compiler/tflchef/tflite/src/TFliteImport.h
index 9d0a642ab..ade8fc810 100644
--- a/compiler/tflchef/tflite/src/TFliteImport.h
+++ b/compiler/tflchef/tflite/src/TFliteImport.h
@@ -17,9 +17,7 @@
 #ifndef __TFLITE_IMPORT_H__
 #define __TFLITE_IMPORT_H__
 
-#include <mio/tflite/schema_generated.h>
-
-#include <souschef/TensorFiller.h>
+#include <tflite_generated.h>
 
 #include <tflchef.pb.h>
 
@@ -42,7 +40,7 @@ bool is_custom(const tflite::OperatorCode *opcode);
 /**
  * @brief Loads TF lite file and provides helpers to access attributes
  */
-class TFliteImport : public souschef::TensorFiller
+class TFliteImport
 {
 public:
   TFliteImport(const tflite::Model *model);
@@ -65,15 +63,59 @@ public:
   std::string opcode_name(const tflite::Operator *op) const;
   size_t buffer_info(const tflite::Tensor *tensor, const uint8_t **buff_data);
 
+  /**
+   * @brief This will record the tensor by index, if it needs filler option,
+   *        such as kernel, bias.
+   */
+  void set_tensor_filler(uint32_t tensor_index) { _tensor_filler[tensor_index] = true; }
+
+  /**
+   * @brief This will store int32 filler values such as reshape information for the tensor
+   */
+  void set_tensor_filler(uint32_t tensor_index, std::vector<int32_t> &expvalues)
+  {
+    _tensor_filler_vint32[tensor_index] = expvalues;
+  }
+
+  /**
+   * @brief This will return true if the tensor by index, needs a filler option.
+   */
+  bool get_tensor_filler(uint32_t tensor_index)
+  {
+    auto it = _tensor_filler.find(tensor_index);
+    if (it != _tensor_filler.end())
+    {
+      return it->second;
+    }
+    return false;
+  }
+
+  /**
+   * @brief This will return true if the tensor by index, needs a int array filler option.
+   */
+  bool get_tensor_filler(uint32_t tensor_index, std::vector<int32_t> &expvalues)
+  {
+    auto it = _tensor_filler_vint32.find(tensor_index);
+    if (it != _tensor_filler_vint32.end())
+    {
+      expvalues = it->second;
+      return true;
+    }
+    return false;
+  }
+
 private:
-  const TFliteSubGraphs_t *_subgraphs{nullptr};
-  const TFliteBuffers_t *_buffers{nullptr};
-  const TFliteTensors_t *_tensors{nullptr};
-  const TFliteOperators_t *_operators{nullptr};
-
-  std::vector<const tflite::OperatorCode *> _op_codes{};
-  std::vector<int32_t> _inputs{};
-  std::vector<int32_t> _outputs{};
+  const TFliteSubGraphs_t *_subgraphs;
+  const TFliteBuffers_t *_buffers;
+  const TFliteTensors_t *_tensors;
+  const TFliteOperators_t *_operators;
+
+  std::vector<const tflite::OperatorCode *> _op_codes;
+  std::vector<int32_t> _inputs;
+  std::vector<int32_t> _outputs;
+
+  std::map<uint32_t, bool> _tensor_filler;
+  std::map<uint32_t, std::vector<int32_t>> _tensor_filler_vint32;
 };
 
 } // namespace tflchef
diff --git a/compiler/tflchef/tflite/src/TFliteOpChef.h b/compiler/tflchef/tflite/src/TFliteOpChef.h
index 98564293b..fc9047ce7 100644
--- a/compiler/tflchef/tflite/src/TFliteOpChef.h
+++ b/compiler/tflchef/tflite/src/TFliteOpChef.h
@@ -17,7 +17,7 @@
 #ifndef __TFLITE_OP_CHEF_H__
 #define __TFLITE_OP_CHEF_H__
 
-#include <mio/tflite/schema_generated.h>
+#include <tflite_generated.h>
 
 #include <tflchef.pb.h>
 
diff --git a/compiler/tflchef/tflite/src/TFliteOpChefs.h b/compiler/tflchef/tflite/src/TFliteOpChefs.h
index 2e4d28051..9f3446840 100644
--- a/compiler/tflchef/tflite/src/TFliteOpChefs.h
+++ b/compiler/tflchef/tflite/src/TFliteOpChefs.h
@@ -18,111 +18,17 @@
 #define __TFLITE_OP_CHEFS_H__
 
 // In alphabet order
-#include "Op/Abs.h"
-#include "Op/Add.h"
-#include "Op/AddN.h"
-#include "Op/ArgMax.h"
-#include "Op/ArgMin.h"
 #include "Op/AveragePool2D.h"
-#include "Op/BatchMatMul.h"
-#include "Op/BatchToSpaceND.h"
-#include "Op/Cast.h"
-#include "Op/Ceil.h"
 #include "Op/Concatenation.h"
 #include "Op/Conv2D.h"
-#include "Op/Cos.h"
-#include "Op/DepthToSpace.h"
 #include "Op/DepthwiseConv2D.h"
-#include "Op/Dequantize.h"
 #include "Op/Div.h"
-#include "Op/ELU.h"
-#include "Op/Equal.h"
-#include "Op/Exp.h"
-#include "Op/ExpandDims.h"
-#include "Op/Fill.h"
-#include "Op/Floor.h"
-#include "Op/FloorDiv.h"
-#include "Op/FloorMod.h"
 #include "Op/FullyConnected.h"
-#include "Op/Gather.h"
-#include "Op/GatherNd.h"
-#include "Op/Greater.h"
-#include "Op/GreaterEqual.h"
-#include "Op/L2Normalize.h"
-#include "Op/L2Pool2D.h"
-#include "Op/LeakyRelu.h"
-#include "Op/Less.h"
-#include "Op/LessEqual.h"
-#include "Op/LocalResponseNormalization.h"
-#include "Op/Log.h"
-#include "Op/LogicalAnd.h"
-#include "Op/LogicalNot.h"
-#include "Op/LogicalOr.h"
-#include "Op/Logistic.h"
-#include "Op/LogSoftmax.h"
-#include "Op/MatrixDiag.h"
-#include "Op/MatrixSetDiag.h"
-#include "Op/Maximum.h"
 #include "Op/MaxPool2D.h"
-#include "Op/Mean.h"
-#include "Op/Minimum.h"
-#include "Op/MirrorPad.h"
-#include "Op/Mul.h"
-#include "Op/Neg.h"
-#include "Op/NonMaxSuppressionV4.h"
-#include "Op/NonMaxSuppressionV5.h"
-#include "Op/NotEqual.h"
-#include "Op/OneHot.h"
-#include "Op/Pack.h"
-#include "Op/Pad.h"
-#include "Op/PadV2.h"
-#include "Op/Pow.h"
-#include "Op/PRelu.h"
-#include "Op/Range.h"
-#include "Op/Rank.h"
-#include "Op/ReduceAny.h"
-#include "Op/ReduceMax.h"
-#include "Op/ReduceMin.h"
-#include "Op/ReduceProd.h"
 #include "Op/ReLU.h"
 #include "Op/ReLU6.h"
-#include "Op/ReLUN1To1.h"
 #include "Op/Reshape.h"
-#include "Op/ResizeBilinear.h"
-#include "Op/ResizeNearestNeighbor.h"
-#include "Op/ReverseSequence.h"
-#include "Op/ReverseV2.h"
-#include "Op/Round.h"
-#include "Op/Rsqrt.h"
-#include "Op/ScatterNd.h"
-#include "Op/SegmentSum.h"
-#include "Op/Select.h"
-#include "Op/SelectV2.h"
-#include "Op/Shape.h"
-#include "Op/Sin.h"
-#include "Op/Slice.h"
-#include "Op/Softmax.h"
-#include "Op/SpaceToBatchND.h"
-#include "Op/SpaceToDepth.h"
-#include "Op/SparseToDense.h"
-#include "Op/Split.h"
-#include "Op/SplitV.h"
 #include "Op/Sqrt.h"
-#include "Op/Square.h"
-#include "Op/SquaredDifference.h"
-#include "Op/Squeeze.h"
-#include "Op/StridedSlice.h"
 #include "Op/Sub.h"
-#include "Op/Sum.h"
-#include "Op/Tanh.h"
-#include "Op/Tile.h"
-#include "Op/TopKV2.h"
-#include "Op/Transpose.h"
-#include "Op/TransposeConv.h"
-#include "Op/UnidirectionalSequenceLSTM.h"
-#include "Op/Unique.h"
-#include "Op/Unpack.h"
-#include "Op/Where.h"
-#include "Op/ZerosLike.h"
 
 #endif // __TFLITE_OP_CHEFS_H__
diff --git a/compiler/tflchef/tflite/src/TFliteOpRegistry.h b/compiler/tflchef/tflite/src/TFliteOpRegistry.h
index 9cc630a97..9e085028c 100644
--- a/compiler/tflchef/tflite/src/TFliteOpRegistry.h
+++ b/compiler/tflchef/tflite/src/TFliteOpRegistry.h
@@ -20,7 +20,9 @@
 #include "TFliteOpChef.h"
 #include "TFliteOpChefs.h"
 
-#include <memory>
+#include <stdex/Memory.h>
+
+using stdex::make_unique;
 
 namespace tflchef
 {
@@ -52,117 +54,19 @@ public:
 private:
   TFliteOpRegistry()
   {
-#define REG_TFL_OP(OPCODE, CLASS) \
-  _tfliteop_map[tflite::BuiltinOperator_##OPCODE] = std::make_unique<CLASS>()
-
-    REG_TFL_OP(ABS, TFliteOpAbs);
-    REG_TFL_OP(ADD, TFliteOpAdd);
-    REG_TFL_OP(ADD_N, TFliteOpAddN);
-    REG_TFL_OP(ARG_MAX, TFliteOpArgMax);
-    REG_TFL_OP(ARG_MIN, TFliteOpArgMin);
-    REG_TFL_OP(AVERAGE_POOL_2D, TFliteOpAveragePool2D);
-    REG_TFL_OP(BATCH_MATMUL, TFliteOpBatchMatMul);
-    REG_TFL_OP(BATCH_TO_SPACE_ND, TFliteOpBatchToSpaceND);
-    REG_TFL_OP(CAST, TFliteOpCast);
-    REG_TFL_OP(CEIL, TFliteOpCeil);
-    REG_TFL_OP(CONCATENATION, TFliteOpConcatenation);
-    REG_TFL_OP(CONV_2D, TFliteOpConv2D);
-    REG_TFL_OP(COS, TFliteOpCos);
-    REG_TFL_OP(DEPTH_TO_SPACE, TFliteOpDepthToSpace);
-    REG_TFL_OP(DEPTHWISE_CONV_2D, TFliteOpDepthwiseConv2D);
-    REG_TFL_OP(DEQUANTIZE, TFliteOpDequantize);
-    REG_TFL_OP(DIV, TFliteOpDiv);
-    REG_TFL_OP(ELU, TFliteOpELU);
-    REG_TFL_OP(EQUAL, TFliteOpEqual);
-    REG_TFL_OP(EXP, TFliteOpExp);
-    REG_TFL_OP(EXPAND_DIMS, TFliteOpExpandDims);
-    REG_TFL_OP(FILL, TFliteOpFill);
-    REG_TFL_OP(FLOOR, TFliteOpFloor);
-    REG_TFL_OP(FLOOR_DIV, TFliteOpFloorDiv);
-    REG_TFL_OP(FLOOR_MOD, TFliteOpFloorMod);
-    REG_TFL_OP(FULLY_CONNECTED, TFliteOpFullyConnected);
-    REG_TFL_OP(GATHER, TFliteOpGather);
-    REG_TFL_OP(GATHER_ND, TFliteOpGatherNd);
-    REG_TFL_OP(GREATER, TFliteOpGreater);
-    REG_TFL_OP(GREATER_EQUAL, TFliteOpGreaterEqual);
-    REG_TFL_OP(L2_NORMALIZATION, TFliteOpL2Normalize);
-    REG_TFL_OP(L2_POOL_2D, TFliteOpL2Pool2D);
-    REG_TFL_OP(LEAKY_RELU, TFliteOpLeakyRelu);
-    REG_TFL_OP(LESS, TFliteOpLess);
-    REG_TFL_OP(LESS_EQUAL, TFliteOpLessEqual);
-    REG_TFL_OP(LOCAL_RESPONSE_NORMALIZATION, TFliteOpLocalResponseNormalization);
-    REG_TFL_OP(LOG, TFliteOpLog);
-    REG_TFL_OP(LOGICAL_AND, TFliteOpLogicalAnd);
-    REG_TFL_OP(LOGICAL_NOT, TFliteOpLogicalNot);
-    REG_TFL_OP(LOGICAL_OR, TFliteOpLogicalOr);
-    REG_TFL_OP(LOGISTIC, TFliteOpLogistic);
-    REG_TFL_OP(LOG_SOFTMAX, TFliteOpLogSoftmax);
-    REG_TFL_OP(MATRIX_DIAG, TFliteOpMatrixDiag);
-    REG_TFL_OP(MAX_POOL_2D, TFliteOpMaxPool2D);
-    REG_TFL_OP(MATRIX_SET_DIAG, TFliteOpMatrixSetDiag);
-    REG_TFL_OP(MAXIMUM, TFliteOpMaximum);
-    REG_TFL_OP(MEAN, TFliteOpMean);
-    REG_TFL_OP(MINIMUM, TFliteOpMinimum);
-    REG_TFL_OP(MIRROR_PAD, TFliteOpMirrorPad);
-    REG_TFL_OP(MUL, TFliteOpMul);
-    REG_TFL_OP(NEG, TFliteOpNeg);
-    REG_TFL_OP(NON_MAX_SUPPRESSION_V4, TFliteOpNonMaxSuppressionV4);
-    REG_TFL_OP(NON_MAX_SUPPRESSION_V5, TFliteOpNonMaxSuppressionV5);
-    REG_TFL_OP(NOT_EQUAL, TFliteOpNotEqual);
-    REG_TFL_OP(ONE_HOT, TFliteOpOneHot);
-    REG_TFL_OP(PACK, TFliteOpPack);
-    REG_TFL_OP(PAD, TFliteOpPad);
-    REG_TFL_OP(PADV2, TFliteOpPadV2);
-    REG_TFL_OP(POW, TFliteOpPow);
-    REG_TFL_OP(PRELU, TFliteOpPRelu);
-    REG_TFL_OP(RANGE, TFliteOpRange);
-    REG_TFL_OP(RANK, TFliteOpRank);
-    REG_TFL_OP(REDUCE_ANY, TFliteOpReduceAny);
-    REG_TFL_OP(REDUCE_MAX, TFliteOpReduceMax);
-    REG_TFL_OP(REDUCE_MIN, TFliteOpReduceMin);
-    REG_TFL_OP(REDUCE_PROD, TFliteOpReduceProd);
-    REG_TFL_OP(RELU, TFliteOpReLU);
-    REG_TFL_OP(RELU6, TFliteOpReLU6);
-    REG_TFL_OP(RELU_N1_TO_1, TFliteOpReLUN1To1);
-    REG_TFL_OP(RESHAPE, TFliteOpReshape);
-    REG_TFL_OP(RESIZE_BILINEAR, TFliteOpResizeBilinear);
-    REG_TFL_OP(RESIZE_NEAREST_NEIGHBOR, TFliteOpResizeNearestNeighbor);
-    REG_TFL_OP(REVERSE_SEQUENCE, TFliteOpReverseSequence);
-    REG_TFL_OP(REVERSE_V2, TFliteOpReverseV2);
-    REG_TFL_OP(ROUND, TFliteOpRound);
-    REG_TFL_OP(RSQRT, TFliteOpRsqrt);
-    REG_TFL_OP(SCATTER_ND, TFliteOpScatterNd);
-    REG_TFL_OP(SEGMENT_SUM, TFliteOpSegmentSum);
-    REG_TFL_OP(SELECT, TFliteOpSelect);
-    REG_TFL_OP(SELECT_V2, TFliteOpSelectV2);
-    REG_TFL_OP(SHAPE, TFliteOpShape);
-    REG_TFL_OP(SIN, TFliteOpSin);
-    REG_TFL_OP(SLICE, TFliteOpSlice);
-    REG_TFL_OP(SOFTMAX, TFliteOpSoftmax);
-    REG_TFL_OP(SPACE_TO_BATCH_ND, TFliteOpSpaceToBatchND);
-    REG_TFL_OP(SPACE_TO_DEPTH, TFliteOpSpaceToDepth);
-    REG_TFL_OP(SPARSE_TO_DENSE, TFliteOpSparseToDense);
-    REG_TFL_OP(SPLIT, TFliteOpSplit);
-    REG_TFL_OP(SPLIT_V, TFliteOpSplitV);
-    REG_TFL_OP(SQRT, TFliteOpSqrt);
-    REG_TFL_OP(SQUARE, TFliteOpSquare);
-    REG_TFL_OP(SQUARED_DIFFERENCE, TFliteOpSquaredDifference);
-    REG_TFL_OP(SQUEEZE, TFliteOpSqueeze);
-    REG_TFL_OP(STRIDED_SLICE, TFliteOpStridedSlice);
-    REG_TFL_OP(SUB, TFliteOpSub);
-    REG_TFL_OP(SUM, TFliteOpSum);
-    REG_TFL_OP(TANH, TFliteOpTanh);
-    REG_TFL_OP(TILE, TFliteOpTile);
-    REG_TFL_OP(TOPK_V2, TFliteOpTopKV2);
-    REG_TFL_OP(TRANSPOSE, TFliteOpTranspose);
-    REG_TFL_OP(TRANSPOSE_CONV, TFliteOpTransposeConv);
-    REG_TFL_OP(UNIDIRECTIONAL_SEQUENCE_LSTM, TFliteOpUnidirectionalSequenceLSTM);
-    REG_TFL_OP(UNIQUE, TFliteOpUnique);
-    REG_TFL_OP(UNPACK, TFliteOpUnpack);
-    REG_TFL_OP(WHERE, TFliteOpWhere);
-    REG_TFL_OP(ZEROS_LIKE, TFliteOpZerosLike);
-
-#undef REG_TFL_OP
+    _tfliteop_map[tflite::BuiltinOperator_AVERAGE_POOL_2D] = make_unique<TFliteOpAveragePool2D>();
+    _tfliteop_map[tflite::BuiltinOperator_CONCATENATION] = make_unique<TFliteOpConcatenation>();
+    _tfliteop_map[tflite::BuiltinOperator_CONV_2D] = make_unique<TFliteOpConv2D>();
+    _tfliteop_map[tflite::BuiltinOperator_DEPTHWISE_CONV_2D] =
+        make_unique<TFliteOpDepthwiseConv2D>();
+    _tfliteop_map[tflite::BuiltinOperator_DIV] = make_unique<TFliteOpDiv>();
+    _tfliteop_map[tflite::BuiltinOperator_FULLY_CONNECTED] = make_unique<TFliteOpFullyConnected>();
+    _tfliteop_map[tflite::BuiltinOperator_MAX_POOL_2D] = make_unique<TFliteOpMaxPool2D>();
+    _tfliteop_map[tflite::BuiltinOperator_RELU] = make_unique<TFliteOpReLU>();
+    _tfliteop_map[tflite::BuiltinOperator_RELU6] = make_unique<TFliteOpReLU6>();
+    _tfliteop_map[tflite::BuiltinOperator_RESHAPE] = make_unique<TFliteOpReshape>();
+    _tfliteop_map[tflite::BuiltinOperator_SQRT] = make_unique<TFliteOpSqrt>();
+    _tfliteop_map[tflite::BuiltinOperator_SUB] = make_unique<TFliteOpSub>();
   }
 
 private: