diff --git a/Controls/MusicOrderViewer.cs b/Controls/MusicOrderViewer.cs
index db02a6d..96bc8b7 100644
--- a/Controls/MusicOrderViewer.cs
+++ b/Controls/MusicOrderViewer.cs
@@ -51,6 +51,20 @@ namespace TaikoSoundEditor.Controls
             CurrentPage = CurrentPage;
         }
 
+        public void RemoveAllSongs(int uniqueId)
+        {
+            SongCards.RemoveAll(c => c.MusicOrder.UniqueId == uniqueId);
+            Selection.RemoveWhere(c => c.MusicOrder.UniqueId == uniqueId);
+            CutSelection.RemoveWhere(c => c.MusicOrder.UniqueId == uniqueId);
+
+            PasteActive = CutSelection.Count > 0;
+            CutActive = RemoveActive = Selection.Count > 0;
+            if (!PasteActive) PasteMode = false;
+            CurrentPage = CurrentPage;
+            Invalidate();
+
+        }
+
         public void RemoveSong(MusicOrder mo)
         {
             SongCards.RemoveAll(c => c.MusicOrder == mo);
diff --git a/MainForm.cs b/MainForm.cs
index c0c6061..d30cc47 100644
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -134,7 +134,7 @@ namespace TaikoSoundEditor
             AddedMusic.Remove(ns);
             Logger.Info("Refreshing list");
             AddedMusicBinding.ResetBindings(false);
-            MusicOrderViewer.RemoveSong(ns.MusicOrder);
+            MusicOrderViewer.RemoveAllSongs(ns.MusicOrder.UniqueId);
 
             Logger.Info("Removing from wordlist & music_attributes");
             WordList.Items.Remove(ns.Word);
@@ -176,7 +176,7 @@ namespace TaikoSoundEditor
             LoadedMusicBox.SelectedIndex = sel;
 
             Logger.Info("Removing from music orders");
-            MusicOrderViewer.RemoveSong(mo);
+            MusicOrderViewer.RemoveAllSongs(mo.UniqueId);
         }
 
         private void RemoveSongButton_Click(object sender, EventArgs e) => ExceptionGuard.Run(() =>
diff --git a/Properties/PublishProfiles/FolderProfile.pubxml.user b/Properties/PublishProfiles/FolderProfile.pubxml.user
index e0329a6..8b7a7b3 100644
--- a/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <History>True|2023-07-31T17:19:48.4524724Z;False|2023-07-31T20:17:55.5982472+03:00;False|2023-07-31T20:17:38.1663347+03:00;True|2023-07-31T19:49:36.9770534+03:00;True|2023-07-31T19:48:14.6352025+03:00;True|2023-07-30T09:51:53.3737837+03:00;True|2023-07-30T09:20:22.7718733+03:00;True|2023-07-30T09:02:22.1384796+03:00;True|2023-07-30T08:20:21.5020489+03:00;True|2023-07-29T11:28:56.2445862+03:00;True|2023-07-29T11:05:03.3876668+03:00;True|2023-07-29T10:54:04.8963992+03:00;True|2023-07-29T10:22:03.4096107+03:00;True|2023-07-29T10:05:26.6712083+03:00;True|2023-07-28T19:30:15.3174413+03:00;True|2023-07-22T19:07:39.3718711+03:00;True|2023-07-22T19:06:41.2393088+03:00;True|2023-07-22T12:07:26.2620601+03:00;True|2023-07-22T12:06:39.9230498+03:00;True|2023-07-22T11:29:18.0153916+03:00;True|2023-07-22T08:23:07.5000923+03:00;True|2023-07-21T20:03:15.6598520+03:00;True|2023-07-21T19:41:13.2800435+03:00;True|2023-07-19T13:08:33.4726289+03:00;True|2023-07-19T12:08:17.2430335+03:00;True|2023-07-18T09:38:50.7615921+03:00;True|2023-07-18T09:25:23.0403589+03:00;True|2023-07-17T17:57:08.1469738+03:00;True|2023-07-17T11:28:41.9554245+03:00;True|2023-07-17T11:15:26.2194507+03:00;</History>
+    <History>True|2023-08-16T16:59:52.2179312Z;True|2023-07-31T20:19:48.4524724+03:00;False|2023-07-31T20:17:55.5982472+03:00;False|2023-07-31T20:17:38.1663347+03:00;True|2023-07-31T19:49:36.9770534+03:00;True|2023-07-31T19:48:14.6352025+03:00;True|2023-07-30T09:51:53.3737837+03:00;True|2023-07-30T09:20:22.7718733+03:00;True|2023-07-30T09:02:22.1384796+03:00;True|2023-07-30T08:20:21.5020489+03:00;True|2023-07-29T11:28:56.2445862+03:00;True|2023-07-29T11:05:03.3876668+03:00;True|2023-07-29T10:54:04.8963992+03:00;True|2023-07-29T10:22:03.4096107+03:00;True|2023-07-29T10:05:26.6712083+03:00;True|2023-07-28T19:30:15.3174413+03:00;True|2023-07-22T19:07:39.3718711+03:00;True|2023-07-22T19:06:41.2393088+03:00;True|2023-07-22T12:07:26.2620601+03:00;True|2023-07-22T12:06:39.9230498+03:00;True|2023-07-22T11:29:18.0153916+03:00;True|2023-07-22T08:23:07.5000923+03:00;True|2023-07-21T20:03:15.6598520+03:00;True|2023-07-21T19:41:13.2800435+03:00;True|2023-07-19T13:08:33.4726289+03:00;True|2023-07-19T12:08:17.2430335+03:00;True|2023-07-18T09:38:50.7615921+03:00;True|2023-07-18T09:25:23.0403589+03:00;True|2023-07-17T17:57:08.1469738+03:00;True|2023-07-17T11:28:41.9554245+03:00;True|2023-07-17T11:15:26.2194507+03:00;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/TaikoSoundEditor.csproj b/TaikoSoundEditor.csproj
index fee5a5c..ec2c37b 100644
--- a/TaikoSoundEditor.csproj
+++ b/TaikoSoundEditor.csproj
@@ -160,9 +160,6 @@
     <None Update="Tools\sox\zlib1.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Tools\tja2fumen-old2.exe">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-    </None>
     <None Update="Tools\tja2fumen.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>