diff --git a/internal/core/src/common/FieldMeta.h b/internal/core/src/common/FieldMeta.h
index e5ccbdd821..394149d8f5 100644
--- a/internal/core/src/common/FieldMeta.h
+++ b/internal/core/src/common/FieldMeta.h
@@ -28,13 +28,13 @@ datatype_sizeof(DataType data_type, int dim = 1) {
         case DataType::FLOAT:
             return sizeof(float);
         case DataType::INT8:
-            return sizeof(uint8_t);
+            return sizeof(int8_t);
         case DataType::INT16:
-            return sizeof(uint16_t);
+            return sizeof(int16_t);
         case DataType::INT32:
-            return sizeof(uint32_t);
+            return sizeof(int32_t);
         case DataType::INT64:
-            return sizeof(uint64_t);
+            return sizeof(int64_t);
         case DataType::VECTOR_FLOAT:
             return sizeof(float) * dim;
         case DataType::VECTOR_BINARY: {
diff --git a/internal/core/src/common/Types.h b/internal/core/src/common/Types.h
index 0ee2d5b3a0..6e56bd4edb 100644
--- a/internal/core/src/common/Types.h
+++ b/internal/core/src/common/Types.h
@@ -27,7 +27,6 @@ using Timestamp = uint64_t;  // TODO: use TiKV-like timestamp
 constexpr auto MAX_TIMESTAMP = std::numeric_limits<Timestamp>::max();
 
 using engine::DataType;
-using engine::FieldElementType;
 using engine::idx_t;
 
 using ScalarArray = proto::schema::ScalarField;
@@ -58,21 +57,20 @@ struct EntityResult {};
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 struct QueryResult {
     QueryResult() = default;
-    QueryResult(uint64_t num_queries, uint64_t topK) : topK_(topK), num_queries_(num_queries) {
+    QueryResult(int64_t num_queries, int64_t topK) : topK_(topK), num_queries_(num_queries) {
         auto count = get_row_count();
         result_distances_.resize(count);
         internal_seg_offsets_.resize(count);
     }
 
-    [[nodiscard]] uint64_t
+    [[nodiscard]] int64_t
     get_row_count() const {
         return topK_ * num_queries_;
     }
 
  public:
-    uint64_t num_queries_;
-    uint64_t topK_;
-    uint64_t seg_id_;
+    int64_t num_queries_;
+    int64_t topK_;
     std::vector<float> result_distances_;
 
  public:
diff --git a/internal/core/src/utils/Types.h b/internal/core/src/utils/Types.h
index 4e404c8035..4dff86801e 100644
--- a/internal/core/src/utils/Types.h
+++ b/internal/core/src/utils/Types.h
@@ -22,11 +22,8 @@
 #include <utility>
 #include <vector>
 
-// #include "utils/Json.h"
+namespace milvus::engine {
 
-namespace milvus {
-namespace engine {
-///////////////////////////////////////////////////////////////////////////////////////////////////
 using idx_t = int64_t;
 using offset_t = int32_t;
 using date_t = int32_t;
@@ -34,14 +31,6 @@ using distance_t = float;
 
 using IDNumbers = std::vector<idx_t>;
 
-// using VectorDistance = faiss::Index::distance_t;
-// using VectorDistances = std::vector<VectorDistance>;
-
-using ResultIds = std::vector<idx_t>;
-using ResultDistances = std::vector<distance_t>;
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
 enum class DataType {
     NONE = 0,
     BOOL = 1,
@@ -59,82 +48,4 @@ enum class DataType {
     VECTOR_FLOAT = 101,
 };
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-enum class FieldElementType {
-    FET_NONE = 0,
-    FET_RAW = 1,
-    FET_BLOOM_FILTER = 2,
-    FET_DELETED_DOCS = 3,
-    FET_INDEX = 4,
-    FET_COMPRESS_SQ8 = 5,
-};
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-// class BinaryData : public cache::DataObj {
-// public:
-//    int64_t
-//    Size() {
-//        return data_.size();
-//    }
-//
-// public:
-//    std::vector<uint8_t> data_;
-//};
-// using BinaryDataPtr = std::shared_ptr<BinaryData>;
-//
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-// class VaribleData : public cache::DataObj {
-// public:
-//    int64_t
-//    Size() {
-//        return data_.size() + offset_.size() * sizeof(int64_t);
-//    }
-//
-// public:
-//    std::vector<uint8_t> data_;
-//    std::vector<int64_t> offset_;
-//};
-// using VaribleDataPtr = std::shared_ptr<VaribleData>;
-//
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-// using FIELD_TYPE_MAP = std::unordered_map<std::string, DataType>;
-// using FIELD_WIDTH_MAP = std::unordered_map<std::string, int64_t>;
-// using FIXEDX_FIELD_MAP = std::unordered_map<std::string, BinaryDataPtr>;
-// using VARIABLE_FIELD_MAP = std::unordered_map<std::string, VaribleDataPtr>;
-// using VECTOR_INDEX_MAP = std::unordered_map<std::string, knowhere::VecIndexPtr>;
-// using STRUCTURED_INDEX_MAP = std::unordered_map<std::string, knowhere::IndexPtr>;
-
-// ///////////////////////////////////////////////////////////////////////////////////////////////////
-// struct DataChunk {
-//     int64_t count_ = 0;
-//     FIXEDX_FIELD_MAP fixed_fields_;
-//     VARIABLE_FIELD_MAP variable_fields_;
-// };
-// using DataChunkPtr = std::shared_ptr<DataChunk>;
-
-// ///////////////////////////////////////////////////////////////////////////////////////////////////
-// struct CollectionIndex {
-//     std::string index_name_;
-//     std::string index_type_;
-//     std::string metric_name_;
-//     milvus::json extra_params_ = {{"nlist", 2048}};
-// };
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-struct VectorsData {
-    uint64_t vector_count_ = 0;
-    std::vector<float> float_data_;
-    std::vector<uint8_t> binary_data_;
-    IDNumbers id_array_;
-};
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-struct AttrsData {
-    uint64_t attr_count_ = 0;
-    std::unordered_map<std::string, engine::DataType> attr_type_;
-    std::unordered_map<std::string, std::vector<uint8_t>> attr_data_;
-    IDNumbers id_array_;
-};
-
-}  // namespace engine
-}  // namespace milvus
+}  // namespace milvus::engine