diff --git a/toonz/sources/toonz/cleanuppopup.cpp b/toonz/sources/toonz/cleanuppopup.cpp
index 8053eb2..4d4fc95 100644
--- a/toonz/sources/toonz/cleanuppopup.cpp
+++ b/toonz/sources/toonz/cleanuppopup.cpp
@@ -517,9 +517,8 @@ bool CleanupPopup::analyzeCleanupList() {
   QList<TXshSimpleLevel *> levelsToBeDeleted;
 
   // Traverse the cleanup list
-  bc::vector<CleanupLevel>::iterator clt, clEnd = m_cleanupLevels.end();
-  for (clt = m_cleanupLevels.begin(); clt != clEnd; ++clt) {
-    TXshSimpleLevel *sl = clt->m_sl;
+  for (auto &clt : m_cleanupLevels) {
+    TXshSimpleLevel *sl = clt.m_sl;
 
     /*--- Cleanup対象LevelのCleanupSettingを取得 ---*/
     loadCleanupParams(m_params.get(),
@@ -527,7 +526,7 @@ bool CleanupPopup::analyzeCleanupList() {
 
     // Check level existence
     /*--- Cleanup後に得られるであろうTLVのパス ---*/
-    TFilePath outputPath = scene->decodeFilePath(clt->m_outputPath);
+    TFilePath outputPath = scene->decodeFilePath(clt.m_outputPath);
     {
       /*-- 出力先にTLVファイルが無ければ問題なし(このLevelはCleanupする) --*/
       if (!TSystem::doesExistFileOrLevel(outputPath)) {
@@ -564,8 +563,8 @@ bool CleanupPopup::analyzeCleanupList() {
       }
 
       // Prompt user for file conflict resolution
-      switch (clt->m_resolution =
-                  Resolution(m_overwriteDialog->execute(&clt->m_outputPath))) {
+      switch (clt.m_resolution =
+                  Resolution(m_overwriteDialog->execute(&clt.m_outputPath))) {
       case CANCEL:
         return false;
 
@@ -596,8 +595,8 @@ bool CleanupPopup::analyzeCleanupList() {
 
       TLevelP level(0);  // Current level info. Yeah the init is a shame... :(
       /*--- 元のLevelと新しいCleanup結果が混合する場合。REPLACE以外 ---*/
-      if (clt->m_resolution == OVERWRITE || clt->m_resolution == WRITE_NEW ||
-          clt->m_resolution == NOPAINT_ONLY) {
+      if (clt.m_resolution == OVERWRITE || clt.m_resolution == WRITE_NEW ||
+          clt.m_resolution == NOPAINT_ONLY) {
         // Check output resolution consistency
         // Retrieve file resolution
         /*---現在在るTLVのサイズと、CleanupSettingsのサイズが一致しているかチェック---*/
@@ -642,7 +641,7 @@ bool CleanupPopup::analyzeCleanupList() {
         }
       }
       /*--- REPLACEの場合、消されるファイルパスのリストを作る ---*/
-      else if (clt->m_resolution == REPLACE) {
+      else if (clt.m_resolution == REPLACE) {
         filePathsToBeDeleted.push_back(outputPath);
 
         levelsToBeDeleted.push_back(sl);
@@ -667,15 +666,15 @@ bool CleanupPopup::analyzeCleanupList() {
 
       // Finally, apply resolution to individual frames.
       /*--- WRITE_NEW は、「未Cleanupのフレームだけ処理する」オプション ---*/
-      if (clt->m_resolution == WRITE_NEW) {
+      if (clt.m_resolution == WRITE_NEW) {
         const TLevel::Table *table = level->getTable();
 
-        clt->m_frames.erase(
-            std::remove_if(clt->m_frames.begin(), clt->m_frames.end(),
+        clt.m_frames.erase(
+            std::remove_if(clt.m_frames.begin(), clt.m_frames.end(),
                            [table](TLevel::Table::key_type const &key) {
                              return table->count(key);
                            }),
-            clt->m_frames.end());
+            clt.m_frames.end());
       }
     }
   }
diff --git a/toonz/sources/toonz/cleanuppopup.h b/toonz/sources/toonz/cleanuppopup.h
index be2bad1..2698b0a 100644
--- a/toonz/sources/toonz/cleanuppopup.h
+++ b/toonz/sources/toonz/cleanuppopup.h
@@ -12,13 +12,8 @@
 #include "tfilepath.h"
 #include "timage.h"
 
-// boost includes
-#include <boost/container/vector.hpp>
-
 #include <QMap>
 
-namespace bc = boost::container;
-
 //================================================
 
 //  Forward declarations
@@ -74,7 +69,7 @@ private:
 
   std::unique_ptr<LevelUpdater> m_updater;  //!< The cleanup level updater.
 
-  bc::vector<CleanupLevel>
+  std::vector<CleanupLevel>
       m_cleanupLevels;        //!< List of levels to be cleanupped.
   std::pair<int, int> m_idx,  //!< Current cleanup list position.
       m_completion;        //!< Count of completed frames versus total frames.
diff --git a/toonz/sources/toonzlib/txshsimplelevel.cpp b/toonz/sources/toonzlib/txshsimplelevel.cpp
index e48b4fe..f04f13a 100644
--- a/toonz/sources/toonzlib/txshsimplelevel.cpp
+++ b/toonz/sources/toonzlib/txshsimplelevel.cpp
@@ -42,8 +42,6 @@
 
 #include "../common/psdlib/psd.h"
 
-namespace bc = boost::container;
-
 //******************************************************************************************
 //    Global stuff
 //******************************************************************************************