diff --git a/jquery_colorpicker.install b/jquery_colorpicker.install
index faa77f7..1fe0085 100644
--- a/jquery_colorpicker.install
+++ b/jquery_colorpicker.install
@@ -43,8 +43,11 @@ function jquery_colorpicker_update_8200() {
   \Drupal::service('module_installer')->install(['colorapi']);
   \Drupal::configFactory()->getEditable('colorapi.settings')->set('enable_color_field', TRUE)->save();
   drupal_flush_all_caches();
-  // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
-  // We are assuming that we want to use the `entity_type.manager` service since no method was called here directly. Please confirm this is the case. See https://www.drupal.org/node/2549139 for more information.
+  // @todo Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
+  // We are assuming that we want to use the `entity_type.manager` service
+  // since no method was called here directly.
+  // Please confirm this is the case.
+  // See https://www.drupal.org/node/2549139 for more information.
   $entity_manager = \Drupal::service('entity_type.manager');
   $database = \Drupal::database();
 
@@ -105,8 +108,9 @@ function jquery_colorpicker_update_8200() {
       $new_field_storage->save();
 
       foreach ($entity_table_data as $result) {
-        // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
-        // You will need to use `\Drupal\core\Database\Database::getConnection()` if you do not yet have access to the container here.
+        // @todo Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
+        // You'll need to use `\Drupal\core\Database\Database::getConnection()`
+        // if you do not yet have access to the container here.
         \Drupal::database()->insert($entity_table_name)
           ->fields([
             'bundle' => $result->bundle,
@@ -122,8 +126,9 @@ function jquery_colorpicker_update_8200() {
 
       if ($database->schema()->tableExists($revision_table_name)) {
         foreach ($revision_table_data as $result) {
-          // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
-          // You will need to use `\Drupal\core\Database\Database::getConnection()` if you do not yet have access to the container here.
+          // @todo Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
+          // You need to use `\Drupal\core\Database\Database::getConnection()`
+          // if you do not yet have access to the container here.
           \Drupal::database()->insert($revision_table_name)
             ->fields([
               'bundle' => $result->bundle,
@@ -140,7 +145,12 @@ function jquery_colorpicker_update_8200() {
 
       // Update the field settings.
       $field_name = $field_storage->getName();
-      if ($fields = $entity_manager->getStorage('field_config')->loadByProperties(['field_name' => $field_name, 'entity_type' => $field_storage->getTargetEntityTypeId()])) {
+      if ($fields = $entity_manager->getStorage('field_config')
+        ->loadByProperties([
+          'field_name' => $field_name,
+          'entity_type' => $field_storage
+            ->getTargetEntityTypeId(),
+        ])) {
         /** @var \Drupal\field\FieldConfigInterface $field */
         // Update the field settings.
         foreach ($fields as $field) {
diff --git a/jquery_colorpicker.module b/jquery_colorpicker.module
index b9c2448..d21d03b 100644
--- a/jquery_colorpicker.module
+++ b/jquery_colorpicker.module
@@ -45,7 +45,10 @@ function jquery_colorpicker_form_alter_common(array &$form, FormStateInterface $
 /**
  * Implements hook_field_info_alter().
  *
- * @deprecated as of Jquery Colorpicker update 8200. Will be removed in Jquery
+ * @deprecated in project:8.x-3.0 and is removed from project:8.x-3.0. http(s)://drupal.org/node/1331966
+ * @see https://www.drupal.org/project/jquery_colorpicker/issues/3058398
+ *
+ *   Deprecated as of Jquery Colorpicker update 8200. Will be removed in Jquery
  *   Colorpicker 8.x-3.x, and/or 9.x-1.x.
  *
  * @see jquery_colorpicker_update_8200()
diff --git a/src/Plugin/Field/FieldFormatter/JqueryColorpickerColorDisplayFormatter.php b/src/Plugin/Field/FieldFormatter/JqueryColorpickerColorDisplayFormatter.php
index 9efb116..6059e9d 100644
--- a/src/Plugin/Field/FieldFormatter/JqueryColorpickerColorDisplayFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/JqueryColorpickerColorDisplayFormatter.php
@@ -13,7 +13,10 @@ namespace Drupal\jquery_colorpicker\Plugin\Field\FieldFormatter;
  *   }
  * )
  *
- * @deprecated as of Jquery Colorpicker update 8200. Will be removed in Jquery
+ * @deprecated in project:8.x-3.0 and is removed from project:8.x-3.0. http(s)://drupal.org/node/1331966
+ * @see https://www.drupal.org/project/jquery_colorpicker/issues/3058398
+ *
+ *   Deprecated as of Jquery Colorpicker update 8200. Will be removed in Jquery
  *   Colorpicker 8.x-3.x, and/or 9.x-1.x. Running
  *   jquery_colorpicker_update_8200() requires the existence of this formatter,
  *   however the field type is obsolete after that update has been run.
diff --git a/src/Plugin/Field/FieldFormatter/JqueryColorpickerDisplayFormatterBase.php b/src/Plugin/Field/FieldFormatter/JqueryColorpickerDisplayFormatterBase.php
index cff81d5..41feb4f 100644
--- a/src/Plugin/Field/FieldFormatter/JqueryColorpickerDisplayFormatterBase.php
+++ b/src/Plugin/Field/FieldFormatter/JqueryColorpickerDisplayFormatterBase.php
@@ -8,7 +8,10 @@ use Drupal\Core\Field\FormatterBase;
 /**
  * Base class for Color API Color Field Formatters.
  *
- * @deprecated as of Jquery Colorpicker update 8200. Will be removed in Jquery
+ * @deprecated in project:8.x-3.0 and is removed from project:8.x-3.0. http(s)://drupal.org/node/1331966
+ * @see https://www.drupal.org/project/jquery_colorpicker/issues/3058398
+ *
+ *   Deprecated as of Jquery Colorpicker update 8200. Will be removed in Jquery
  *   Colorpicker 8.x-3.x, and/or 9.x-1.x. Running
  *   jquery_colorpicker_update_8200() requires the existence formatters that,
  *   extend this class, however the field type is obsolete after that update has
diff --git a/src/Plugin/Field/FieldFormatter/JqueryColorpickerRawHexDisplayFormatter.php b/src/Plugin/Field/FieldFormatter/JqueryColorpickerRawHexDisplayFormatter.php
index 4ccda7a..efdbe7a 100644
--- a/src/Plugin/Field/FieldFormatter/JqueryColorpickerRawHexDisplayFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/JqueryColorpickerRawHexDisplayFormatter.php
@@ -14,7 +14,10 @@ namespace Drupal\jquery_colorpicker\Plugin\Field\FieldFormatter;
  *   }
  * )
  *
- * @deprecated as of Jquery Colorpicker update 8200. Will be removed in Jquery
+ * @deprecated in project:8.x-3.0 and is removed from project:8.x-3.0. http(s)://drupal.org/node/1331966
+ * @see https://www.drupal.org/project/jquery_colorpicker/issues/3058398
+ *
+ *   Deprecated as of Jquery Colorpicker update 8200. Will be removed in Jquery
  *   Colorpicker 8.x-3.x, and/or 9.x-1.x. Running
  *   jquery_colorpicker_update_8200() requires the existence of this formatter,
  *   however the field type is obsolete after that update has been run.
diff --git a/src/Plugin/Field/FieldFormatter/JqueryColorpickerRawRgbDisplayFormatter.php b/src/Plugin/Field/FieldFormatter/JqueryColorpickerRawRgbDisplayFormatter.php
index 00ff993..37b5a77 100644
--- a/src/Plugin/Field/FieldFormatter/JqueryColorpickerRawRgbDisplayFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/JqueryColorpickerRawRgbDisplayFormatter.php
@@ -13,7 +13,10 @@ namespace Drupal\jquery_colorpicker\Plugin\Field\FieldFormatter;
  *   }
  * )
  *
- * @deprecated as of Jquery Colorpicker update 8200. Will be removed in Jquery
+ * @deprecated in project:8.x-3.0 and is removed from project:8.x-3.0. http(s)://drupal.org/node/1331966
+ * @see https://www.drupal.org/project/jquery_colorpicker/issues/3058398
+ *
+ *   Deprecated as of Jquery Colorpicker update 8200. Will be removed in Jquery
  *   Colorpicker 8.x-3.x, and/or 9.x-1.x. Running
  *   jquery_colorpicker_update_8200() requires the existence of this formatter,
  *   however the field type is obsolete after that update has been run.
diff --git a/src/Plugin/Field/FieldFormatter/JqueryColorpickerTextDisplayFormatter.php b/src/Plugin/Field/FieldFormatter/JqueryColorpickerTextDisplayFormatter.php
index 0cfee8d..b3e7d05 100644
--- a/src/Plugin/Field/FieldFormatter/JqueryColorpickerTextDisplayFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/JqueryColorpickerTextDisplayFormatter.php
@@ -14,7 +14,10 @@ namespace Drupal\jquery_colorpicker\Plugin\Field\FieldFormatter;
  *   }
  * )
  *
- * @deprecated as of Jquery Colorpicker update 8200. Will be removed in Jquery
+ * @deprecated in project:8.x-3.0 and is removed from project:8.x-3.0. http(s)://drupal.org/node/1331966
+ * @see https://www.drupal.org/project/jquery_colorpicker/issues/3058398
+ *
+ *   Deprecated as of Jquery Colorpicker update 8200. Will be removed in Jquery
  *   Colorpicker 8.x-3.x, and/or 9.x-1.x. Running
  *   jquery_colorpicker_update_8200() requires the existence of this formatter,
  *   however the field type is obsolete after that update has been run.
diff --git a/src/Plugin/Field/FieldType/JqueryColorpickerColorItem.php b/src/Plugin/Field/FieldType/JqueryColorpickerColorItem.php
index 4e1075d..82074dd 100644
--- a/src/Plugin/Field/FieldType/JqueryColorpickerColorItem.php
+++ b/src/Plugin/Field/FieldType/JqueryColorpickerColorItem.php
@@ -16,7 +16,10 @@ use Drupal\Core\TypedData\DataDefinition;
  *   default_widget = "colorapi_color_widget",
  * )
  *
- * @deprecated as of Jquery Colorpicker update 8200. Will be removed in Jquery
+ * @deprecated in project:8.x-3.0 and is removed from project:8.x-3.0. http(s)://drupal.org/node/1331966
+ * @see https://www.drupal.org/project/jquery_colorpicker/issues/3058398
+ *
+ *   Deprecated as of Jquery Colorpicker update 8200. Will be removed in Jquery
  *   Colorpicker 8.x-3.x, and/or 9.x-1.x. Running
  *   jquery_colorpicker_update_8200() requires the existence of this field type,
  *   however the field type is obsolete after that update has been run. As such,
diff --git a/tests/src/Unit/Service/jQueryColorpickerServiceTest.php b/tests/src/Unit/Service/jQueryColorpickerServiceTest.php
deleted file mode 100644
index e478e07..0000000
--- a/tests/src/Unit/Service/jQueryColorpickerServiceTest.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-namespace Drupal\Test\jquery_colorpicker\Service;
-
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Tests\UnitTestCase;
-use Drupal\jquery_colorpicker\Service\JQueryColorpickerService;
-
-/**
- * @coversDefaultClass \Drupal\jquery_colorpicker\Service\JQueryColorpickerService
- * @group jquery_colorpicker
- */
-class JQueryColorpickerServiceTest extends UnitTestCase {
-  use StringTranslationTrait;
-
-  /**
-   * The JQuery Colorpicker Service.
-   *
-   * @var \Drupal\jquery_colorpicker\Service\JQueryColorpickerService
-   */
-  protected $JQueryColorpickerService;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    $container = new ContainerBuilder();
-    $container->set('string_translation', $this->getStringTranslationStub());
-    \Drupal::setContainer($container);
-
-    $this->JQueryColorpickerService = new JQueryColorpickerService();
-  }
-
-  /**
-   * @covers ::validateHexColor
-   *
-   * @dataProvider providerTestValidateHexColor
-   */
-  public function testValidateHexColor($expected, $color) {
-    $this->assertEquals($expected, $this->JQueryColorpickerService->validateHexColor($color));
-  }
-
-  /**
-   * Provides data for the testValidateHexColor test.
-   */
-  public function providerTestValidateHexColor() {
-
-    $data = [];
-    $data[] = [FALSE, FALSE];
-    $data[] = [FALSE, []];
-    $test = new \stdClass();
-    $data[] = [FALSE, $test];
-    $data[] = [FALSE, 1.23];
-    $data[] = [FALSE, 12345];
-    $data[] = [FALSE, "12345"];
-    $data[] = [FALSE, "11111g"];
-    $data[] = [FALSE, "11111G"];
-    $data[] = [FALSE, "fffffg"];
-    $data[] = [FALSE, "fffffG"];
-    $data[] = [FALSE, "FFFFFg"];
-    $data[] = [FALSE, "FFFFFG"];
-    $data[] = [FALSE, "#12345"];
-    $data[] = [FALSE, "#11111g"];
-    $data[] = [FALSE, "#11111G"];
-    $data[] = [FALSE, "#fffffg"];
-    $data[] = [FALSE, "#fffffG"];
-    $data[] = [FALSE, "#FFFFFg"];
-    $data[] = [FALSE, "#FFFFFG"];
-
-    // Valid submissions.
-    $data[] = [TRUE, "#FFF"];
-    $data[] = [TRUE, "#123456"];
-    $data[] = [TRUE, "#11111f"];
-    $data[] = [TRUE, "#11111F"];
-    $data[] = [TRUE, "#FFFFF1"];
-    $data[] = [TRUE, "#fffff1"];
-
-    return $data;
-  }
-
-}