diff --git a/cleanup/main.cpp b/cleanup/main.cpp
index 0f82f4e..44cf0bf 100644
--- a/cleanup/main.cpp
+++ b/cleanup/main.cpp
@@ -31,15 +31,13 @@
 std::vector<std::string> files = {
     STATIC_HANDLER_STAGED_NAME, TARBALL_STAGED_NAME, HASH_FILENAME,
     VERIFY_STATUS_FILENAME, UPDATE_STATUS_FILENAME};
-
-FileSystem fileSystemHelper;
 } // namespace ipmi_flash
 
 extern "C" std::unique_ptr<blobs::GenericBlobInterface> createHandler()
 {
     auto handler = ipmi_flash::FileCleanupHandler::CreateCleanupHandler(
         ipmi_flash::cleanupBlobId, ipmi_flash::files,
-        &ipmi_flash::fileSystemHelper);
+        std::make_unique<ipmi_flash::FileSystem>());
 
     if (!handler)
     {