diff --git a/app/Http/Requests/EstimatesRequest.php b/app/Http/Requests/EstimatesRequest.php
index 4821adae..b312d742 100644
--- a/app/Http/Requests/EstimatesRequest.php
+++ b/app/Http/Requests/EstimatesRequest.php
@@ -25,7 +25,6 @@ class EstimatesRequest extends FormRequest
         $rules = [
             'estimate_date' => 'required',
             'expiry_date' => 'required',
-            'estimate_number' => 'required|unique:estimates,estimate_number',
             'user_id' => 'required',
             'discount' => 'required',
             'discount_val' => 'required',
@@ -41,10 +40,6 @@ class EstimatesRequest extends FormRequest
             'items.*.price' => 'required'
         ];
 
-        if ($this->getMethod() == 'PUT') {
-            $rules['estimate_number'] = $rules['estimate_number'].','.$this->get('id');
-        }
-
         return $rules;
     }
 }
diff --git a/app/Http/Requests/InvoicesRequest.php b/app/Http/Requests/InvoicesRequest.php
index 6b8f247e..387d251d 100644
--- a/app/Http/Requests/InvoicesRequest.php
+++ b/app/Http/Requests/InvoicesRequest.php
@@ -25,7 +25,6 @@ class InvoicesRequest extends FormRequest
         $rules = [
             'invoice_date' => 'required',
             'due_date' => 'required',
-            'invoice_number' => 'required|unique:invoices,invoice_number',
             'user_id' => 'required',
             'discount' => 'required',
             'discount_val' => 'required',
@@ -41,10 +40,6 @@ class InvoicesRequest extends FormRequest
             'items.*.price' => 'required'
         ];
 
-        if ($this->getMethod() == 'PUT') {
-            $rules['invoice_number'] = $rules['invoice_number'].','.$this->get('id');
-        }
-
         return $rules;
     }
 }
diff --git a/app/Http/Requests/PaymentRequest.php b/app/Http/Requests/PaymentRequest.php
index 97efbe12..940687ad 100644
--- a/app/Http/Requests/PaymentRequest.php
+++ b/app/Http/Requests/PaymentRequest.php
@@ -24,15 +24,10 @@ class PaymentRequest extends FormRequest
     {
         $rules = [
             'payment_date' => 'required',
-            'payment_number' => 'required|unique:payments,payment_number',
             'user_id' => 'required',
             'amount' => 'required',
         ];
 
-        if ($this->getMethod() == 'PUT') {
-            $rules['payment_number'] = $rules['payment_number'].','.$this->route('payment');
-        }
-
         return $rules;
     }
 }
diff --git a/app/Listeners/Updates/v2/Version200.php b/app/Listeners/Updates/v2/Version200.php
index 7d3ebc79..3782d7a2 100644
--- a/app/Listeners/Updates/v2/Version200.php
+++ b/app/Listeners/Updates/v2/Version200.php
@@ -6,7 +6,6 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Database\Schema\Blueprint;
 use Crater\Listeners\Updates\Listener;
-use Crater\Listeners\Updates\v2\Version200;
 use Crater\Events\UpdateFinished;
 use Crater\Setting;
 use Crater\Address;