diff --git a/app/Database/migrations/2017_06_28_195426_create_pirep_tables.php b/app/Database/migrations/2017_06_28_195426_create_pirep_tables.php
index fa0b6b61..957635e6 100644
--- a/app/Database/migrations/2017_06_28_195426_create_pirep_tables.php
+++ b/app/Database/migrations/2017_06_28_195426_create_pirep_tables.php
@@ -21,7 +21,6 @@ class CreatePirepTables extends Migration
             $table->unsignedInteger('user_id');
             $table->unsignedInteger('airline_id');
             $table->unsignedInteger('aircraft_id')->nullable();
-            $table->string('flight_id', \App\Models\Flight::ID_MAX_LENGTH)->nullable();
             $table->string('flight_number', 10)->nullable();
             $table->string('route_code', 5)->nullable();
             $table->string('route_leg', 5)->nullable();
@@ -47,7 +46,7 @@ class CreatePirepTables extends Migration
 
             $table->primary('id');
             $table->index('user_id');
-            $table->index('flight_id');
+            $table->index('flight_number');
             $table->index('dpt_airport_id');
             $table->index('arr_airport_id');
         });
diff --git a/app/Http/Requests/Acars/FileRequest.php b/app/Http/Requests/Acars/FileRequest.php
index a8a93dbf..471aa946 100644
--- a/app/Http/Requests/Acars/FileRequest.php
+++ b/app/Http/Requests/Acars/FileRequest.php
@@ -27,7 +27,6 @@ class FileRequest extends FormRequest
 
             'airline_id'            => 'nullable|exists:airlines,id',
             'aircraft_id'           => 'nullable|exists:aircraft,id',
-            'flight_id'             => 'nullable|exists:flights,id',
             'flight_number'         => 'nullable',
             'dpt_airport_id'        => 'nullable',
             'arr_airport_id'        => 'nullable',
diff --git a/app/Http/Requests/Acars/UpdateRequest.php b/app/Http/Requests/Acars/UpdateRequest.php
index 29e67286..c631e95f 100644
--- a/app/Http/Requests/Acars/UpdateRequest.php
+++ b/app/Http/Requests/Acars/UpdateRequest.php
@@ -23,7 +23,6 @@ class UpdateRequest extends FormRequest
         $rules = [
             'airline_id'            => 'nullable|exists:airlines,id',
             'aircraft_id'           => 'nullable|exists:aircraft,id',
-            'flight_id'             => 'nullable|exists:flights,id',
             'flight_number'         => 'nullable',
             'dpt_airport_id'        => 'nullable',
             'arr_airport_id'        => 'nullable',
diff --git a/app/Models/Pirep.php b/app/Models/Pirep.php
index d9cf0928..8469f27b 100644
--- a/app/Models/Pirep.php
+++ b/app/Models/Pirep.php
@@ -29,7 +29,6 @@ class Pirep extends BaseModel
         'user_id',
         'airline_id',
         'aircraft_id',
-        'flight_id',
         'flight_number',
         'route_code',
         'route_leg',
@@ -293,11 +292,6 @@ class Pirep extends BaseModel
         return $this->hasMany(PirepFieldValues::class, 'pirep_id');
     }
 
-    public function flight()
-    {
-        return $this->belongsTo(Flight::class, 'flight_id');
-    }
-
     public function pilot()
     {
         return $this->user();
diff --git a/app/Repositories/PirepRepository.php b/app/Repositories/PirepRepository.php
index 752dff0a..92141180 100644
--- a/app/Repositories/PirepRepository.php
+++ b/app/Repositories/PirepRepository.php
@@ -10,7 +10,6 @@ class PirepRepository extends BaseRepository
 {
     protected $fieldSearchable = [
         'user_id',
-        'flight_id',
         'status',
         'state',
     ];