diff --git a/core/lib/presentation/views/html_viewer/html_content_viewer_on_web_widget.dart b/core/lib/presentation/views/html_viewer/html_content_viewer_on_web_widget.dart
index 1bdb229b7..d3d98ac12 100644
--- a/core/lib/presentation/views/html_viewer/html_content_viewer_on_web_widget.dart
+++ b/core/lib/presentation/views/html_viewer/html_content_viewer_on_web_widget.dart
@@ -123,8 +123,6 @@ class _HtmlContentViewerOnWebState extends State<HtmlContentViewerOnWeb> {
         function handleOnClickLink(e) {
            let link = e.target;
            let textContent = e.target.textContent;
-           console.log("handleOnClickLink: " + link);
-           console.log("handleOnClickLink: " + textContent);
            if (link && isValidMailtoLink(link)) {
               window.parent.postMessage(JSON.stringify({"view": "$createdViewId", "type": "toDart: OpenLink", "url": "" + link}), "*");
               e.preventDefault();
diff --git a/lib/features/base/base_bindings.dart b/lib/features/base/base_bindings.dart
index ff5f9bd6f..088a07c51 100644
--- a/lib/features/base/base_bindings.dart
+++ b/lib/features/base/base_bindings.dart
@@ -1,12 +1,9 @@
-
-import 'package:core/utils/app_logger.dart';
 import 'package:get/get_instance/src/bindings_interface.dart';
 
 abstract class BaseBindings extends Bindings {
 
   @override
   void dependencies() {
-    log('BaseBindings::dependencies():');
     bindingsDataSourceImpl();
     bindingsDataSource();
     bindingsRepositoryImpl();
diff --git a/lib/features/base/base_controller.dart b/lib/features/base/base_controller.dart
index d0ab5565f..46b5d1cbc 100644
--- a/lib/features/base/base_controller.dart
+++ b/lib/features/base/base_controller.dart
@@ -167,7 +167,7 @@ abstract class BaseController extends GetxController
   void handleErrorViewState(Object error, StackTrace stackTrace) {}
 
   void handleExceptionAction({Failure? failure, Exception? exception}) {
-    log('BaseController::handleExceptionAction():failure: $failure | exception: $exception');
+    logError('BaseController::handleExceptionAction():failure: $failure | exception: $exception');
   }
 
   void handleFailureViewState(Failure failure) {
diff --git a/lib/features/composer/presentation/composer_controller.dart b/lib/features/composer/presentation/composer_controller.dart
index 268369015..0fec1adf2 100644
--- a/lib/features/composer/presentation/composer_controller.dart
+++ b/lib/features/composer/presentation/composer_controller.dart
@@ -533,7 +533,6 @@ class ComposerController extends BaseController {
       emailActionType: actionType,
       mailboxRole: mailboxRole
     );
-    log('ComposerController::_initEmailAddress:recipients: $recipients');
     final userProfile =  mailboxDashBoardController.userProfile.value;
     if (userProfile != null) {
       final isSender = presentationEmail.from.asList().every((element) => element.email == userProfile.email);
@@ -1374,7 +1373,6 @@ class ComposerController extends BaseController {
   }
 
   void onEditorFocusChange(bool isFocus) {
-    log('ComposerController::onEditorFocusChange(): Focus: $isFocus');
     if (isFocus) {
       _collapseAllRecipient();
       _autoCreateEmailTag();
@@ -1391,9 +1389,6 @@ class ComposerController extends BaseController {
     final inputToEmail = toEmailAddressController.text;
     final inputCcEmail = ccEmailAddressController.text;
     final inputBccEmail = bccEmailAddressController.text;
-    log('ComposerController::_autoCreateEmailTag():inputToEmail: $inputToEmail');
-    log('ComposerController::_autoCreateEmailTag():inputCcEmail: $inputCcEmail');
-    log('ComposerController::_autoCreateEmailTag():inputBccEmail: $inputBccEmail');
 
     if (inputToEmail.isNotEmpty) {
       _autoCreateToEmailTag(inputToEmail);
@@ -1595,7 +1590,6 @@ class ComposerController extends BaseController {
       maxWithEditor = maxWith - 120;
     }
     final inlineImage = await _selectFromFile();
-    log('ComposerController::insertImage(): $inlineImage');
     if (inlineImage != null) {
       if (PlatformInfo.isWeb) {
         _insertImageOnWeb(inlineImage);
@@ -1842,10 +1836,7 @@ class ComposerController extends BaseController {
   }
 
   void initTextEditor(String? text) {
-    if (_initTextEditor == null) {
-      _initTextEditor = text;
-      log('ComposerController::initTextEditor():$_initTextEditor');
-    }
+    _initTextEditor ??= text;
   }
 
   void setSubjectEmail(String subject) => subjectEmail.value = subject;
diff --git a/model/lib/email/email_content.dart b/model/lib/email/email_content.dart
index 2a7fb2350..be3108c83 100644
--- a/model/lib/email/email_content.dart
+++ b/model/lib/email/email_content.dart
@@ -1,8 +1,5 @@
-
-import 'package:core/utils/app_logger.dart';
 import 'package:equatable/equatable.dart';
 import 'package:model/email/email_content_type.dart';
-import 'package:model/model.dart';
 
 class EmailContent with EquatableMixin {
 
@@ -41,12 +38,9 @@ extension EmailContentExtension on EmailContent {
     if (content.startsWith(firstTags) && content.endsWith(latestTags)) {
       const firstIndex = firstTags.length;
       final latestIndex = content.length - latestTags.length;
-      log('EmailContentExtension::_getContentOriginal(): firstIndex: $firstIndex');
-      log('EmailContentExtension::_getContentOriginal(): latestIndex: $latestIndex');
 
       if (latestIndex > firstIndex) {
         final contentOriginal = content.substring(firstIndex, latestIndex);
-        log('EmailContentExtension::_getContentOriginal(): contentOriginal: $contentOriginal');
         return contentOriginal;
       }
     }
diff --git a/model/lib/extensions/session_extension.dart b/model/lib/extensions/session_extension.dart
index 6668942f4..5d9da0a65 100644
--- a/model/lib/extensions/session_extension.dart
+++ b/model/lib/extensions/session_extension.dart
@@ -1,6 +1,5 @@
 
 import 'package:core/presentation/extensions/uri_extension.dart';
-import 'package:core/utils/app_logger.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart';
 import 'package:jmap_dart_client/jmap/core/capability/capability_properties.dart';
@@ -16,14 +15,11 @@ extension SessionExtension on Session {
     final downloadUrlValid = jmapUrl != null
       ? downloadUrl.toQualifiedUrl(baseUrl: Uri.parse(jmapUrl))
       : downloadUrl;
-    log('SessionExtension::getDownloadUrl():downloadUrlValid: $downloadUrlValid');
     var baseUrl = '${downloadUrlValid.origin}${downloadUrlValid.path}?${downloadUrlValid.query}';
     if (baseUrl.endsWith('/')) {
       baseUrl = baseUrl.substring(0, baseUrl.length - 1);
     }
-    log('SessionExtension::getDownloadUrl(): $baseUrl');
     final downloadUrlDecode = Uri.decodeFull(baseUrl);
-    log('SessionExtension::getDownloadUrl(): DECODE $downloadUrlDecode');
     return downloadUrlDecode;
   }
 
@@ -31,13 +27,11 @@ extension SessionExtension on Session {
     final uploadUrlValid = jmapUrl != null
       ? uploadUrl.toQualifiedUrl(baseUrl: Uri.parse(jmapUrl))
       : uploadUrl;
-    log('SessionExtension::getUploadUri():downloadUrlValid: $uploadUrlValid');
     final baseUrl = '${uploadUrlValid.origin}${uploadUrlValid.path}';
     final uploadUriTemplate = UriTemplate(Uri.decodeFull(baseUrl));
     final uploadUri = uploadUriTemplate.expand({
       'accountId' : accountId.id.value
     });
-    log('SessionExtension::getUploadUri(): uploadUri: $uploadUri');
     return Uri.parse(uploadUri);
   }