diff --git a/app/Http/Controllers/Migration/StepsController.php b/app/Http/Controllers/Migration/StepsController.php
index 77ab762d631c..ef4a89bc3121 100644
--- a/app/Http/Controllers/Migration/StepsController.php
+++ b/app/Http/Controllers/Migration/StepsController.php
@@ -89,14 +89,6 @@ class StepsController extends BaseController
                 url('/migration/companies?hosted=true')
             );
 
-            //old
-            // return redirect(
-            //     url('/migration/auth')
-            // );
-
-            // return redirect(
-            //     url('/migration/endpoint')
-            // );
         }
 
         return redirect(
@@ -153,6 +145,7 @@ class StepsController extends BaseController
     {
 
         $url = 'https://invoicing.co/api/v1/confirm_forwarding';
+        // $url = 'http://devhosted.test:8000/api/v1/confirm_forwarding';
 
         $headers = [
             'X-API-HOSTED-SECRET' => config('ninja.ninja_hosted_secret'),
@@ -197,6 +190,7 @@ class StepsController extends BaseController
         ]);
 
         if($response->getStatusCode() == 401){
+            info("autoForwardUrl");
             info($response->getBody());
 
         } elseif ($response->getStatusCode() == 200) {
@@ -217,10 +211,21 @@ class StepsController extends BaseController
                 $account_settings->forward_url_for_v5 = rtrim($forwarding_url,'/');
                 $account_settings->save();
 
+            $billing_transferred = $message_body['billing_transferred'];
+
+            if($billing_transferred == 'true'){
+
+                $company = $account->company;
+                $company->plan = null;
+                $company->plan_expires = null;
+                $company->save();
+            }
+
 
         } else {
+            info("failed to autoforward");
             info(json_decode($response->getBody()->getContents()));
-
+            // dd('else');
         }
 
         return back();
@@ -335,7 +340,6 @@ class StepsController extends BaseController
 
         try {
             $migrationData = $this->generateMigrationData($request->all());
-
             
                 $completeService->data($migrationData)
                 ->endpoint(session('MIGRATION_ENDPOINT'))
@@ -436,8 +440,6 @@ class StepsController extends BaseController
             Storage::makeDirectory('migrations');
             $file = Storage::path("migrations/{$fileName}.zip");
 
-            //$file = storage_path("migrations/{$fileName}.zip");
-
             ksort($localMigrationData);
 
             $zip = new \ZipArchive();
diff --git a/app/Jobs/HostedMigration.php b/app/Jobs/HostedMigration.php
index b96e059b4069..f1d87c38cf26 100644
--- a/app/Jobs/HostedMigration.php
+++ b/app/Jobs/HostedMigration.php
@@ -54,15 +54,15 @@ class HostedMigration extends Job
 
         $completeService->data($migrationData)
         ->endpoint('https://v5-app1.invoicing.co')
-        // ->endpoint('http://ninja.test:8000')
+//         ->endpoint('http://devhosted.test:8000')
         ->start();
 
     }
 
     private function getToken()
     {
-        $url = 'https://invoicing.co/api/v1/get_migration_account';
-        // $url = 'http://ninja.test:8000/api/v1/get_migration_account';
+        //$url = 'https://invoicing.co/api/v1/get_migration_account';
+        $url = 'http://devhosted.test:8000/api/v1/get_migration_account';
 
         $headers = [
             'X-API-HOSTED-SECRET' => $this->v4_secret,
@@ -98,27 +98,10 @@ class HostedMigration extends Job
             $this->migration_token = $message_body['token'];
 
         } else {
-            info(json_decode($response->getBody()->getContents()));
+            // info(json_decode($response->getBody()->getContents()));
 
         }
 
-
-        // $body = \Unirest\Request\Body::json($body);
-
-        // $response = Request::post($url, $headers, $body);
-
-        // if (in_array($response->code, [200])) {
-            
-        //     $data = $response->body;
-        //     info(print_r($data,1));
-        //     $this->migration_token = $data->token; 
-
-        // } else {
-        //     info("getting token failed");
-        //     info($response->raw_body);
-
-        // }   
-
         return $this;
     }
 
diff --git a/app/Services/Migration/CompleteService.php b/app/Services/Migration/CompleteService.php
index c7ce22b5bdbd..620cdeb1c470 100644
--- a/app/Services/Migration/CompleteService.php
+++ b/app/Services/Migration/CompleteService.php
@@ -75,12 +75,11 @@ class CompleteService
             'headers' => $this->getHeaders(),
         ]);
 
-        
         $payload_data = [
                 'multipart'=> array_merge($files, $payload),
              ];
 
-        info(print_r($payload_data,1));
+        // info(print_r($payload_data,1));
         $response = $client->request("POST", $this->getUrl(),$payload_data);
 
         if($response->getStatusCode() == 200){
@@ -88,7 +87,7 @@ class CompleteService
             $this->isSuccessful = true;
             return json_decode($response->getBody(),true);
         }else {
-            info($response->raw_body);
+            // info($response->raw_body);
 
             $this->isSuccessful = false;
             $this->errors = [
@@ -98,25 +97,6 @@ class CompleteService
 
         return $this;
 
-
-
-
-        // $body = \Unirest\Request\Body::multipart(['companies' => json_encode($data)], $files);
-
-        // $response = Request::post($this->getUrl(), $this->getHeaders(), $body);
-
-        // if (in_array($response->code, [200])) {
-        //     $this->isSuccessful = true;
-        // } else {
-        //     info($response->raw_body);
-
-        //     $this->isSuccessful = false;
-        //     $this->errors = [
-        //         'Oops, something went wrong. Migration can\'t be processed at the moment. Please checks the logs.',
-        //     ];
-        // }
-
-        return $this;
     }
 
     public function isSuccessful()
diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php
index c8eae3ec81a0..66531b2716f0 100644
--- a/app/Traits/GenerateMigrationResources.php
+++ b/app/Traits/GenerateMigrationResources.php
@@ -1543,7 +1543,7 @@ trait GenerateMigrationResources
             }
             catch(\Exception $e){
             
-                info($config);
+                // info($config);
 
             }