diff --git a/bmc/version-handler/version_handler.cpp b/bmc/version-handler/version_handler.cpp
index 9918e33..fee62d9 100644
--- a/bmc/version-handler/version_handler.cpp
+++ b/bmc/version-handler/version_handler.cpp
@@ -127,21 +127,6 @@
 
 bool VersionBlobHandler::close(uint16_t session)
 {
-    return cleanup(session);
-}
-
-bool VersionBlobHandler::stat(uint16_t session, blobs::BlobMeta* meta)
-{
-    return false;
-}
-
-bool VersionBlobHandler::expire(uint16_t session)
-{
-    return cleanup(session);
-}
-
-bool VersionBlobHandler::cleanup(uint16_t session)
-{
     try
     {
         auto& pack = *sessionToBlob.at(session);
@@ -155,4 +140,16 @@
         return false;
     }
 }
+
+bool VersionBlobHandler::stat(uint16_t session, blobs::BlobMeta* meta)
+{
+    return false;
+}
+
+bool VersionBlobHandler::expire(uint16_t session)
+{
+    close(session);
+    return true;
+}
+
 } // namespace ipmi_flash
diff --git a/bmc/version-handler/version_handler.hpp b/bmc/version-handler/version_handler.hpp
index 891977d..24b0d3a 100644
--- a/bmc/version-handler/version_handler.hpp
+++ b/bmc/version-handler/version_handler.hpp
@@ -64,7 +64,6 @@
     bool close(uint16_t session) override;
     bool stat(uint16_t session, blobs::BlobMeta* meta) override;
     bool expire(uint16_t session) override;
-    bool cleanup(uint16_t session);
 
   private:
     struct BlobInfo