diff --git a/download_count.install b/download_count.install
index 0dd5eab..908ac26 100755
--- a/download_count.install
+++ b/download_count.install
@@ -18,13 +18,13 @@ function download_count_schema() {
         'not null' => TRUE,
       ),
       'fid' => array(
-        'description' => 'The id from the drupal file_managed table of the file downloaded.',
+        'description' => 'The {file_managed}.fid of the file downloaded.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
       ),
       'uid' => array(
-        'description' => 'The uid of the user that downloaded the file.',
+        'description' => 'The {user}.uid of user who downloaded the file.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
@@ -44,7 +44,7 @@ function download_count_schema() {
         'default' => 0,
       ),
       'ip_address' => array(
-        'description' => "The IP address of the downloading user.",
+        'description' => 'The IP address of the downloading user.',
         'type' => 'varchar',
         'length' => 128,
         'not null' => TRUE,
@@ -83,7 +83,7 @@ function download_count_schema() {
         'not null' => TRUE,
       ),
       'fid' => array(
-        'description' => t('The id from the drupal files table of the file downloaded.'),
+        'description' => 'The {file_managed}.fid of the file downloaded.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
@@ -104,14 +104,14 @@ function download_count_schema() {
         'default' => 0,
       ),
       'date' => array(
-        'description' => t('The date the file was downloaded.'),
+        'description' => 'The date the file was downloaded.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
       ),
       'count' => array(
-        'description' => t('Number of times a file was downloaded in one day.'),
+        'description' => 'Number of times a file was downloaded in one day.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
@@ -135,23 +135,6 @@ function download_count_schema() {
  * Implements hook_uninstall().
  */
 function download_count_uninstall() {
-  \Drupal::state()->delete('download_count.download_count_excluded_file_extensions');
-  \Drupal::state()->delete('download_count.download_count_view_page_limit');
-  \Drupal::state()->delete('download_count.download_count_view_page_items');
-  \Drupal::state()->delete('download_count.download_count_view_page_title');
-  \Drupal::state()->delete('download_count.download_count_view_page_header');
-  \Drupal::state()->delete('download_count.download_count_view_page_footer');
-  \Drupal::state()->delete('download_count.download_count_export_range');
-  \Drupal::state()->delete('download_count.download_count_sparklines');
-  \Drupal::state()->delete('download_count.download_count_sparkline_min');
-  \Drupal::state()->delete('download_count.download_count_sparkline_height');
-  \Drupal::state()->delete('download_count.download_count_sparkline_width');
-  \Drupal::state()->delete('download_count.download_count_last_cron');
-  \Drupal::state()->delete('download_count.download_count_details_daily_limit');
-  \Drupal::state()->delete('download_count.download_count_details_weekly_limit');
-  \Drupal::state()->delete('download_count.download_count_details_monthly_limit');
-  \Drupal::state()->delete('download_count.download_count_details_yearly_limit');
-  \Drupal::state()->delete('download_count.download_count_flood_limit');
-  \Drupal::state()->delete('download_count.download_count_flood_window');
-  drupal_set_message(t('The download_count module has been uninstalled.'));
+  \Drupal::service('config.factory')->getEditable('download_count.settings')->delete();
+  drupal_set_message(t('The download count module has been uninstalled.'));
 }
\ No newline at end of file