diff --git a/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.BopomofoSearch.cs b/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.BopomofoSearch.cs
index 4cf3032..583b017 100644
--- a/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.BopomofoSearch.cs
+++ b/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.BopomofoSearch.cs
@@ -1,7 +1,7 @@
 using System.IO;
 using IniParser;
 using IniParser.Model;
-using DBObj;
+
 /* Song Search with ZhuYin */
 namespace DualScreenDemo
 {
@@ -311,7 +311,7 @@ namespace DualScreenDemo
             // 例如：根據輸入框的內容搜尋歌曲
             string query = $"SELECT * FROM SongLibrary WHERE `歌曲注音` = '{searchText}' ";
 
-            List<SongData> searchResults = SearchSongs_Mysql(query);              
+            var searchResults = SearchSongs_Mysql(query);              
             // 重置分頁    
             currentPage = 0;
             currentSongList = searchResults;
diff --git a/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.WordCountSearch.cs b/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.WordCountSearch.cs
index bbd372a..f1cecdf 100644
--- a/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.WordCountSearch.cs
+++ b/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.WordCountSearch.cs
@@ -4,26 +4,6 @@ using IniParser;
 using IniParser.Model;
 using System.Text; 
 
-
-/*
-        ZhuYinSingers -> WordCountSongs
-        ZhuYin -> WordCount
-        phonetic -> numberWordCount
-        Phonetic -> NumberWordCount
-        inputBoxFontName -> inputBoxWordCountFontName
-        inputBoxFontSize -> inputBoxWordCountFontSize
-        inputBoxFontStyle -> inputBoxWordCountFontStyle
-        inputBoxForeColor -> inputBoxWordCountForeColor
-        LoadConfigData -> LoadConfigDataforWordCountSongs
-        LoadButtonCoordinates -> LoadButtonCoordinatesForWordCountSongs
-        LoadButtonImages -> LoadButtonImagesForWordCountSongs
-        LoadSpecialButtonCoordinates -> LoadSpecialButtonCoordinatesForWordCountSongs
-        RemoveWhiteBorder -> RemoveWhiteBorderForWordCountSongs
-        CreateSpecialButton -> CreateSpecialButtonForWordCountSongs
-        LoadInputBoxConfig -> LoadInputBoxConfigForWordCountSongs
-*/
-
-
 namespace DualScreenDemo
 {
     public partial class PrimaryForm
diff --git a/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.cs b/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.cs
index ac4defc..4393487 100644
--- a/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.cs
+++ b/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.cs
@@ -1,7 +1,3 @@
-using MySqlConnector;
-using DBObj;
-using System.Globalization; 
-using System.IO;
 namespace DualScreenDemo
 {
     /*