diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index fe9ea8505b5a..63803aa46499 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -29,7 +29,6 @@ use App\Http\Middleware\QueryLogging;
 use App\Http\Middleware\RedirectIfAuthenticated;
 use App\Http\Middleware\SetDb;
 use App\Http\Middleware\SetDbByCompanyKey;
-use App\Http\Middleware\SetDefaultMailer;
 use App\Http\Middleware\SetDomainNameDb;
 use App\Http\Middleware\SetEmailDb;
 use App\Http\Middleware\SetInviteDb;
@@ -160,6 +159,5 @@ class Kernel extends HttpKernel
         'contact_key_login' => ContactKeyLogin::class,
         'check_client_existence' => CheckClientExistence::class,
         'user_verified' => UserVerified::class,
-        'default_mailer' => SetDefaultMailer::class,
     ];
 }
diff --git a/app/Http/Middleware/SetDefaultMailer.php b/app/Http/Middleware/SetDefaultMailer.php
deleted file mode 100644
index dec0e382ade9..000000000000
--- a/app/Http/Middleware/SetDefaultMailer.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Invoice Ninja (https://invoiceninja.com).
- *
- * @link https://github.com/invoiceninja/invoiceninja source repository
- *
- * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
- *
- * @license https://opensource.org/licenses/AAL
- */
-
-namespace App\Http\Middleware;
-
-use App\Libraries\MultiDB;
-use Closure;
-use Illuminate\Http\Request;
-use stdClass;
-
-class SetDefaultMailer
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  Request  $request
-     * @param Closure $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next)
-    {
-
-        config(['mail.default' => config('mail.default')]);
-
-        return $next($request);
-    }
-}
diff --git a/app/Jobs/Util/StartMigration.php b/app/Jobs/Util/StartMigration.php
index 337a57f1e661..e26c7462ed74 100644
--- a/app/Jobs/Util/StartMigration.php
+++ b/app/Jobs/Util/StartMigration.php
@@ -26,6 +26,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Storage;
 use ZipArchive;
 
 class StartMigration implements ShouldQueue
@@ -110,6 +111,8 @@ class StartMigration implements ShouldQueue
 
             Import::dispatchNow($file, $this->company, $this->user);
 
+            Storage::deleteDirectory(public_path("storage/migrations/{$filename}"));
+
         } catch (NonExistingMigrationFile | ProcessingMigrationArchiveFailed | ResourceNotAvailableForMigration | MigrationValidatorFailed | ResourceDependencyMissing $e) {
 
             Mail::to($this->user)->send(new MigrationFailed($e, $e->getMessage()));
diff --git a/routes/api.php b/routes/api.php
index 3363c54ffc3a..1dd0e044e87b 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -13,12 +13,12 @@
 
 use Illuminate\Support\Facades\Route;
 
-Route::group(['middleware' => ['api_secret_check', 'default_mailer']], function () {
+Route::group(['middleware' => ['api_secret_check']], function () {
     Route::post('api/v1/signup', 'AccountController@store')->name('signup.submit');
     Route::post('api/v1/oauth_login', 'Auth\LoginController@oauthApiLogin');
 });
 
-Route::group(['middleware' => ['api_secret_check', 'email_db', 'default_mailer']], function () {
+Route::group(['middleware' => ['api_secret_check', 'email_db']], function () {
     Route::post('api/v1/login', 'Auth\LoginController@apiLogin')->name('login.submit');
     Route::post('api/v1/reset_password', 'Auth\ForgotPasswordController@sendResetLinkEmail');
 });