diff --git a/GanjooRazor/Areas/Admin/Pages/Donations.cshtml.cs b/GanjooRazor/Areas/Admin/Pages/Donations.cshtml.cs
index 98439835..7fc902ad 100644
--- a/GanjooRazor/Areas/Admin/Pages/Donations.cshtml.cs
+++ b/GanjooRazor/Areas/Admin/Pages/Donations.cshtml.cs
@@ -2,9 +2,7 @@
 using System.Linq;
 using System.Net.Http;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using System.Web;
 using DNTPersianUtils.Core;
 using GanjooRazor.Utils;
 using Microsoft.AspNetCore.Mvc;
@@ -104,7 +102,7 @@ namespace GanjooRazor.Areas.Admin.Pages
                 if(donation != null)
                 {
                     int rowNumber = Donations.Length - Array.IndexOf(Donations, donation);
-                    string donorName = GanjoorPoemTools.StripHtmlTags(donation.DonorName);
+                    string donorName = GanjoorHtmlTools.StripHtmlTags(donation.DonorName);
                     if(donorName.StartsWith("آقای"))
                     {
                         donorName = $"جناب {donorName}";
diff --git a/GanjooRazor/Areas/Admin/Pages/ReviewCatEdits.cshtml.cs b/GanjooRazor/Areas/Admin/Pages/ReviewCatEdits.cshtml.cs
index 495d87a2..f8a9870e 100644
--- a/GanjooRazor/Areas/Admin/Pages/ReviewCatEdits.cshtml.cs
+++ b/GanjooRazor/Areas/Admin/Pages/ReviewCatEdits.cshtml.cs
@@ -90,7 +90,7 @@ namespace GanjooRazor.Areas.Admin.Pages
                         }
                         PageInformation = JObject.Parse(await pageQuery.Content.ReadAsStringAsync()).ToObject<GanjoorPageCompleteViewModel>();
 
-                        Links = GanjoorPoemTools.ExtractLinksWithRegex(Correction.DescriptionHtml);
+                        Links = GanjoorHtmlTools.ExtractLinksWithRegex(Correction.DescriptionHtml);
 
                     }
 
diff --git a/GanjooRazor/Areas/User/Pages/CatEditor.cshtml.cs b/GanjooRazor/Areas/User/Pages/CatEditor.cshtml.cs
index 91328372..998ede04 100644
--- a/GanjooRazor/Areas/User/Pages/CatEditor.cshtml.cs
+++ b/GanjooRazor/Areas/User/Pages/CatEditor.cshtml.cs
@@ -8,8 +8,6 @@ using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
 using System;
-using System.Text.RegularExpressions;
-using System.Web;
 using RMuseum.Utils;
 
 namespace GanjooRazor.Areas.User.Pages
@@ -125,7 +123,7 @@ namespace GanjooRazor.Areas.User.Pages
         {
             try
             {
-                Correction.Description = GanjoorPoemTools.StripHtmlTags(Correction.DescriptionHtml);
+                Correction.Description = GanjoorHtmlTools.StripHtmlTags(Correction.DescriptionHtml);
                 using (HttpClient secureClient = new HttpClient())
                 {
                     if (await GanjoorSessionChecker.PrepareClient(secureClient, Request, Response))