diff --git a/app/Http/Controllers/BrevoController.php b/app/Http/Controllers/BrevoController.php
index c8db34674645..be4c7e9de2bd 100644
--- a/app/Http/Controllers/BrevoController.php
+++ b/app/Http/Controllers/BrevoController.php
@@ -187,17 +187,17 @@ class BrevoController extends BaseController
         $input = $request->all();
 
         // validation for client mail credentials by recipient
-        if ($request->has('company')) {
-            if (!($request->has('token')))
-                return response()->json(['message' => 'Unauthorized'], 403);
+        // if ($request->has('company')) {
+        //     if (!($request->has('token')))
+        //         return response()->json(['message' => 'Unauthorized'], 403);
 
-            $company = MultiDB::findAndSetDbByCompanyId($request->has('company'));
-            $company_brevo_secret = $company?->settings?->email_sending_method === 'client_brevo' && $company?->settings?->brevo_secret ? $company->settings->brevo_secret : null;
-            if (!$company || !$company_brevo_secret || $request->get('token') !== $company_brevo_secret)
-                return response()->json(['message' => 'Unauthorized'], 403);
+        //     $company = MultiDB::findAndSetDbByCompanyId($request->has('company'));
+        //     $company_brevo_secret = $company?->settings?->email_sending_method === 'client_brevo' && $company?->settings?->brevo_secret ? $company->settings->brevo_secret : null;
+        //     if (!$company || !$company_brevo_secret || $request->get('token') !== $company_brevo_secret)
+        //         return response()->json(['message' => 'Unauthorized'], 403);
 
-        } else if (!($request->has('token') && $request->get('token') == config('services.brevo.secret')))
-            return response()->json(['message' => 'Unauthorized'], 403);
+        // } else if (!($request->has('token') && $request->get('token') == config('services.brevo.secret')))
+        //     return response()->json(['message' => 'Unauthorized'], 403);
 
         if (!array_key_exists('items', $input)) {
             Log::info('Failed: Message could not be parsed, because required parameters are missing.');
diff --git a/app/Http/Controllers/PostMarkController.php b/app/Http/Controllers/PostMarkController.php
index 917c8ed44c84..e76782323c33 100644
--- a/app/Http/Controllers/PostMarkController.php
+++ b/app/Http/Controllers/PostMarkController.php
@@ -270,9 +270,6 @@ class PostMarkController extends BaseController
     public function inboundWebhook(Request $request)
     {
 
-        Log::info($request->all());
-        Log::info($request->headers);
-
         $input = $request->all();
 
         if (!(array_key_exists("MessageStream", $input) && $input["MessageStream"] == "inbound") || !array_key_exists("To", $input) || !array_key_exists("From", $input) || !array_key_exists("MessageID", $input)) {
diff --git a/app/Services/InboundMail/InboundMailEngine.php b/app/Services/InboundMail/InboundMailEngine.php
index c45a7e62d8d8..14690a4bd5af 100644
--- a/app/Services/InboundMail/InboundMailEngine.php
+++ b/app/Services/InboundMail/InboundMailEngine.php
@@ -224,8 +224,6 @@ class InboundMailEngine
             return true;
 
         // from vendors
-        if ($company->inbound_mailbox_allow_vendors && $company->vendors()->where("invoicing_email", $email->from)->orWhere("invoicing_domain", $domain)->exists())
-            return true;
         if ($company->inbound_mailbox_allow_vendors && VendorContact::where("company_id", $company->id)->where("email", $email->from)->exists())
             return true;
 
@@ -238,9 +236,6 @@ class InboundMailEngine
     }
     private function getClient(Company $company, InboundMail $email)
     {
-        // $parts = explode('@', $email->from);
-        // $domain = array_pop($parts);
-
         $clientContact = ClientContact::where("company_id", $company->id)->where("email", $email->from)->first();
         $client = $clientContact->client();
 
@@ -248,16 +243,8 @@ class InboundMailEngine
     }
     private function getVendor(Company $company, InboundMail $email)
     {
-        $parts = explode('@', $email->from);
-        $domain = array_pop($parts);
-
-        $vendor = Vendor::where("company_id", $company->id)->where('invoicing_email', $email->from)->first();
-        if ($vendor == null)
-            $vendor = Vendor::where("company_id", $company->id)->where("invoicing_domain", $domain)->first();
-        if ($vendor == null) {
-            $vendorContact = VendorContact::where("company_id", $company->id)->where("email", $email->from)->first();
-            $vendor = $vendorContact->vendor();
-        }
+        $vendorContact = VendorContact::where("company_id", $company->id)->where("email", $email->from)->first();
+        $vendor = $vendorContact->vendor();
 
         return $vendor;
     }
diff --git a/database/migrations/2023_12_10_110951_create_imap_configuration_fields.php b/database/migrations/2023_12_10_110951_inbound_mail_parsing.php
similarity index 86%
rename from database/migrations/2023_12_10_110951_create_imap_configuration_fields.php
rename to database/migrations/2023_12_10_110951_inbound_mail_parsing.php
index f1b1c21603d7..f750d07065b4 100644
--- a/database/migrations/2023_12_10_110951_create_imap_configuration_fields.php
+++ b/database/migrations/2023_12_10_110951_inbound_mail_parsing.php
@@ -23,10 +23,6 @@ return new class extends Migration {
             $table->text("inbound_mailbox_blacklist_domains")->nullable();
             $table->text("inbound_mailbox_blacklist_senders")->nullable();
         });
-        Schema::table('vendors', function (Blueprint $table) {
-            $table->string("invoicing_email")->nullable();
-            $table->string("invoicing_domain")->nullable();
-        });
     }
 
     /**