diff --git a/cpp/src/db/DBImpl.cpp b/cpp/src/db/DBImpl.cpp
index 8f0fc277152dbb7d6b4901e0e4d6e4975aa822c8..bffea82ef00fae320a6d6bf3e577a5d569f4e4e2 100644
--- a/cpp/src/db/DBImpl.cpp
+++ b/cpp/src/db/DBImpl.cpp
@@ -242,6 +242,8 @@ Status DBImpl::background_merge_files(const std::string& group_id) {
         try_build_index();
     }
 
+    _pMeta->cleanup_ttl_files(1);
+
     return Status::OK();
 }
 
diff --git a/cpp/src/db/DBMetaImpl.cpp b/cpp/src/db/DBMetaImpl.cpp
index 194570d13be320d4b8c82c02b5a698cd91f42d99..45a92fee6c0285d9dcbaa4fb3ec2cb57f8b506e2 100644
--- a/cpp/src/db/DBMetaImpl.cpp
+++ b/cpp/src/db/DBMetaImpl.cpp
@@ -366,6 +366,38 @@ Status DBMetaImpl::update_files(GroupFilesSchema& files) {
     return Status::OK();
 }
 
+Status DBMetaImpl::cleanup_ttl_files(uint16_t seconds) {
+    auto now = GetMicroSecTimeStamp();
+    auto selected = ConnectorPtr->select(columns(&GroupFileSchema::id,
+                                               &GroupFileSchema::group_id,
+                                               &GroupFileSchema::file_id,
+                                               &GroupFileSchema::file_type,
+                                               &GroupFileSchema::rows,
+                                               &GroupFileSchema::date),
+                                      where(c(&GroupFileSchema::file_type) == (int)GroupFileSchema::TO_DELETE and
+                                            c(&GroupFileSchema::updated_time) > now - 1000000*seconds));
+
+    GroupFilesSchema updated;
+
+    for (auto& file : selected) {
+        GroupFileSchema group_file;
+        group_file.id = std::get<0>(file);
+        group_file.group_id = std::get<1>(file);
+        group_file.file_id = std::get<2>(file);
+        group_file.file_type = std::get<3>(file);
+        group_file.rows = std::get<4>(file);
+        group_file.date = std::get<5>(file);
+        GetGroupFilePath(group_file);
+        if (group_file.file_type == GroupFileSchema::TO_DELETE) {
+            boost::filesystem::remove(group_file.location);
+        }
+        ConnectorPtr->remove<GroupFileSchema>(group_file.id);
+        std::cout << "Removing deleted id=" << group_file.id << " location=" << group_file.location << std::endl;
+    }
+
+    return Status::OK();
+}
+
 Status DBMetaImpl::cleanup() {
     auto selected = ConnectorPtr->select(columns(&GroupFileSchema::id,
                                                &GroupFileSchema::group_id,
diff --git a/cpp/src/db/DBMetaImpl.h b/cpp/src/db/DBMetaImpl.h
index 726ce15bec229f0c765cf7a34f69809040f933b6..7ac04433438b17ea2796c38a2d44ecae6b13d183 100644
--- a/cpp/src/db/DBMetaImpl.h
+++ b/cpp/src/db/DBMetaImpl.h
@@ -46,6 +46,8 @@ public:
 
     virtual Status cleanup() override;
 
+    virtual Status cleanup_ttl_files(uint16_t seconds) override;
+
     virtual ~DBMetaImpl();
 
 private:
diff --git a/cpp/src/db/LocalMetaImpl.cpp b/cpp/src/db/LocalMetaImpl.cpp
index 07a26240e9addf4f8c1c462b9cfe269d52577ef3..f7192a05b7c72267df231b0114878c1ed681961a 100644
--- a/cpp/src/db/LocalMetaImpl.cpp
+++ b/cpp/src/db/LocalMetaImpl.cpp
@@ -241,6 +241,11 @@ Status LocalMetaImpl::cleanup() {
     return Status::OK();
 }
 
+Status LocalMetaImpl::cleanup_ttl_files(uint16_t seconds) {
+    // PXU TODO
+    return Status::OK();
+}
+
 } // namespace meta
 } // namespace engine
 } // namespace vecwise
diff --git a/cpp/src/db/LocalMetaImpl.h b/cpp/src/db/LocalMetaImpl.h
index 8d6bb570765ecddec66e2f8cd9b4d9e11902ab6a..6c687500e1c5393e1061d3639f5114edec2040ce 100644
--- a/cpp/src/db/LocalMetaImpl.h
+++ b/cpp/src/db/LocalMetaImpl.h
@@ -41,6 +41,8 @@ public:
 
     virtual Status files_to_index(GroupFilesSchema&) override;
 
+    virtual Status cleanup_ttl_files(uint16_t seconds) override;
+
 private:
 
     Status GetGroupMetaInfoByPath(const std::string& path, GroupSchema& group_info);
diff --git a/cpp/src/db/Meta.h b/cpp/src/db/Meta.h
index c630ab21012868545a7b95eb36bdc5abea1557d3..4dbc275f656a3804ba34b7d8eb2c2aa3eba4b443 100644
--- a/cpp/src/db/Meta.h
+++ b/cpp/src/db/Meta.h
@@ -81,6 +81,7 @@ public:
     virtual Status files_to_index(GroupFilesSchema&) = 0;
 
     virtual Status cleanup() = 0;
+    virtual Status cleanup_ttl_files(uint16_t) = 0;
 
     static DateT GetDate(const std::time_t& t);
     static DateT GetDate();