diff --git a/api/src/Model/Model/CompoundKeyTrait.php b/api/src/Model/Model/CompoundKeyTrait.php
index 06e8a5af..cc0ed3f7 100644
--- a/api/src/Model/Model/CompoundKeyTrait.php
+++ b/api/src/Model/Model/CompoundKeyTrait.php
@@ -11,7 +11,6 @@
 namespace Spira\Model\Model;
 
 use LogicException;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\Builder;
 
 trait CompoundKeyTrait
@@ -38,64 +37,11 @@ protected static function bootUuidTrait()
      */
     protected static function bootCompoundKeyTrait()
     {
-        $vars = get_class_vars(__CLASS__);
-        if (! is_array($vars['primaryKey'])) {
+        if(! is_array(self::getPrimaryKey())) {
             throw new LogicException('primaryKey must be an array');
         }
     }
 
-    /**
-     * Find model by compound key.
-     *
-     * @param  array $compound
-     *
-     * @return BaseModel
-     */
-    public function findByCompoundKey(array $compound)
-    {
-        return $this->findOrFail($compound);
-    }
-
-    /**
-     * Find a model by its compound key or throw an exception.
-     *
-     * @param  array $compound
-     * @param  array $columns
-     *
-     * @return BaseModel
-     *
-     * @throws ModelNotFoundException
-     */
-    public function findOrFail($compound, $columns = ['*'])
-    {
-        $result = $this->find($compound, $columns);
-
-        if (! is_null($result)) {
-            return $result;
-        }
-
-        throw (new ModelNotFoundException)->setModel(get_class($this->model));
-    }
-
-    /**
-     * Find a model by its compound key.
-     *
-     * @param  array $compound
-     * @param  array $columns
-     *
-     * @return BaseModel|null
-     */
-    public function find(array $compound, $columns = ['*'])
-    {
-        $query = $this->newQuery();
-
-        foreach ($compound as $column => $value) {
-            $query->where($this->getQualifiedColumnName($column), '=', $value);
-        }
-
-        return $query->first($columns);
-    }
-
     /**
      * Get an attribute from the model.
      *
@@ -114,21 +60,6 @@ public function getAttribute($key)
         return parent::getAttribute($key);
     }
 
-    /**
-     * Insert the given attributes on the model.
-     *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
-     * @param  array  $attributes
-     *
-     * @return void
-     */
-    protected function insertAndSetId(Builder $query, $attributes)
-    {
-        // With the case of a compount primary key, we do not have a specific id
-        // to set, so we override this method and leave out the part to set id.
-        $query->insert($attributes);
-    }
-
     /**
      * Get the table qualified column name.
      *
diff --git a/api/tests/Traits/CompoundKeyTraitTest.php b/api/tests/Traits/CompoundKeyTraitTest.php
new file mode 100644
index 00000000..e2994fdd
--- /dev/null
+++ b/api/tests/Traits/CompoundKeyTraitTest.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Spira framework.
+ *
+ * @link https://github.com/spira/spira
+ *
+ * For the full copyright and license information, please view the LICENSE file that was distributed with this source code.
+ */
+use App\Models\Localization;
+
+/**
+ * Class CompoundKeyTraitTest.
+ */
+class CompoundKeyTraitTest extends TestCase
+{
+    /**
+     * @expectedException     LogicException
+     * @expectedExceptionCode 0
+     */
+    public function testBootCompoundKeyTrait()
+    {
+
+        MockSinglePK::bootCompoundKeyTrait();
+
+    }
+
+    public function testGetQualifiedColumnName()
+    {
+        $localization = new Localization();
+
+        $qualifiedColumnName = $localization->getQualifiedColumnName('region_code');
+
+        $this->assertEquals($qualifiedColumnName, 'localizations.region_code');
+    }
+
+}
+
+class MockSinglePK extends Localization
+{
+    protected $primaryKey = 'foo_id';
+}