diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Main/NavMenu.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Main/NavMenu.razor
index ae592b1fd8..c7a1e62b59 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Main/NavMenu.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/Main/NavMenu.razor
@@ -16,6 +16,7 @@
             @Localizer[nameof(AppStrings.TodoTitle)]
         </BitText>
     </a>
+    @*#endif*@
 
     <a href="@Urls.TermsPage">
         <BitIcon IconName="@BitIconName.EntityExtraction" Color="@(IsActive(Urls.TermsPage) ? BitColor.Primary : BitColor.SecondaryForeground)" />
@@ -23,7 +24,6 @@
             @Localizer[nameof(AppStrings.TermsTitle)]
         </BitText>
     </a>
-    @*#endif*@
 
     @*#if (sample == "Admin")*@
     <a href="@Urls.DashboardPage">
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Components/Pages/AboutPage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Components/Pages/AboutPage.razor.cs
index 1587f509a9..13891c92be 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Components/Pages/AboutPage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Components/Pages/AboutPage.razor.cs
@@ -1,4 +1,5 @@
-using System.Diagnostics;
+//-:cnd:noEmit
+using System.Diagnostics;
 
 namespace Boilerplate.Client.Maui.Components.Pages;
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/Android/Services/PushNotificationFirebaseMessagingService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/Android/Services/PushNotificationFirebaseMessagingService.cs
index e5e01e2072..4740f582b8 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/Android/Services/PushNotificationFirebaseMessagingService.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Platforms/Android/Services/PushNotificationFirebaseMessagingService.cs
@@ -1,9 +1,7 @@
 using Android.App;
 using Android.Content;
 using Firebase.Messaging;
-//#if (notification == true)
 using Plugin.LocalNotification;
-//#endif
 
 namespace Boilerplate.Client.Maui.Platforms.Android.Services;
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/NotificationHubController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/NotificationHubController.cs
index 7b57fec38a..db10cf36ec 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/NotificationHubController.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/NotificationHubController.cs
@@ -1,4 +1,5 @@
-using Boilerplate.Shared.Controllers;
+//-:cnd:noEmit
+using Boilerplate.Shared.Controllers;
 using Boilerplate.Server.Api.Services;
 using Boilerplate.Shared.Dtos.PushNotification;