diff --git a/lib/Drupal/views/Tests/Handler/HandlerAllTest.php b/lib/Drupal/views/Tests/Handler/HandlerAllTest.php
index 8b5bb3a9fd341e125e033e8845c4878d137346d3..02fa8f506cf49e9aa3b18f47f5862b4969856849 100644
--- a/lib/Drupal/views/Tests/Handler/HandlerAllTest.php
+++ b/lib/Drupal/views/Tests/Handler/HandlerAllTest.php
@@ -35,10 +35,9 @@ class HandlerAllTest extends HandlerTestBase {
     'node',
     'search',
     'statistics',
-    'system',
     'taxonomy',
     'translation',
-    'user'
+    'user',
   );
 
   public static function getInfo() {
diff --git a/lib/Views/system/Plugin/views/filter/Type.php b/lib/Views/system/Plugin/views/filter/Type.php
deleted file mode 100644
index 0cdb44f8cdcfb300cdd71e477b6bb0b38106d6e6..0000000000000000000000000000000000000000
--- a/lib/Views/system/Plugin/views/filter/Type.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Views\system\Plugin\views\filter\Type.
- */
-
-namespace Views\system\Plugin\views\filter;
-
-use Drupal\views\Plugin\views\filter\InOperator;
-use Drupal\Core\Annotation\Plugin;
-
-/**
- * Filter by system type.
- *
- * @Plugin(
- *   id = "system_type",
- *   module = "system"
- * )
- */
-class Type extends InOperator {
-
-  function get_value_options() {
-    if (!isset($this->value_options)) {
-      $this->value_title = t('Type');
-      // Enable filtering by type.
-      $types = array();
-      // Uses db_query() rather than db_select() because the query is static and
-      // does not include any variables.
-      $types = db_query('SELECT DISTINCT(type) FROM {system} ORDER BY type')->fetchAllKeyed(0, 0);
-      $this->value_options = $types;
-    }
-  }
-
-}
diff --git a/modules/system.views.inc b/modules/system.views.inc
deleted file mode 100644
index fc0086fe2933679d348dfde84ffcb2126ed778c4..0000000000000000000000000000000000000000
--- a/modules/system.views.inc
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-/**
- * @file
- * Provide views data and handlers for system.module.
- *
- * @ingroup views_module_handlers
- */
-
-/**
- * Implements hook_views_data().
- */
-function system_views_data() {
-  $data = array();
-
-  // ----------------------------------------------------------------------
-  // system table
-  $data['system']['table']['group']  = t('System');
-
-  // Advertise this table as a possible base table
-  $data['system']['table']['base'] = array(
-    'field' => 'filename',
-    'title' => t('Module/Theme/Theme engine'),
-    'help' => t('Modules/Themes/Theme engines in your codebase.'),
-  );
-
-  // fields
-  // - filename
-  $data['system']['filename'] = array(
-    'title' => t('Module/Theme/Theme engine filename'),
-    'help' => t('The path of the primary file for this item, relative to the Drupal root; e.g. modules/node/node.module.'),
-    'field' => array(
-      'id' => 'standard',
-      'click sortable' => TRUE,
-    ),
-    'argument' => array(
-      'id' => 'string',
-      'name field' => 'filename', // the field to display in the summary.
-    ),
-    'filter' => array(
-      'id' => 'string',
-    ),
-    'sort' => array(
-      'id' => 'standard',
-    ),
-  );
-  // - name
-  $data['system']['name'] = array(
-    'title' => t('Module/Theme/Theme engine name'),
-    'help' => t('The name of the item; e.g. node.'),
-    'field' => array(
-      'id' => 'standard',
-      'click sortable' => TRUE,
-    ),
-    'argument' => array(
-      'id' => 'string',
-      'name field' => 'name', // the field to display in the summary.
-    ),
-    'filter' => array(
-      'id' => 'string',
-    ),
-    'sort' => array(
-      'id' => 'standard',
-    ),
-  );
-  // - type
-  $data['system']['type'] = array(
-    'title' => t('Type'),
-    'help' => t('The type of the item, either module, theme, or theme_engine.'),
-    'field' => array(
-      'id' => 'standard',
-      'click sortable' => TRUE,
-    ),
-    'argument' => array(
-      'id' => 'string',
-      'name field' => 'type', // the field to display in the summary.
-    ),
-    'filter' => array(
-      'id' => 'system_type',
-    ),
-    'sort' => array(
-      'id' => 'standard',
-    ),
-  );
-  // - status
-  $data['system']['status'] = array(
-    'title' => t('Status'),
-    'help' => t('Boolean indicating whether or not this item is enabled.'),
-    'field' => array(
-      'id' => 'boolean',
-      'click sortable' => TRUE,
-    ),
-    'argument' => array(
-      'id' => 'numeric',
-      'name field' => 'status', // the field to display in the summary.
-    ),
-    'filter' => array(
-      'id' => 'boolean',
-    ),
-    'sort' => array(
-      'id' => 'standard',
-    ),
-  );
-  // - schema version
-  $data['system']['schema_version'] = array(
-    'title' => t('Schema version'),
-    'help' => t("The module's database schema version number. -1 if the module is not installed (its tables do not exist); 0 or the largest N of the module's hook_update_N() function that has either been run or existed when the module was first installed."),
-    'field' => array(
-      'id' => 'numeric',
-      'click sortable' => TRUE,
-    ),
-    'argument' => array(
-      'id' => 'numeric',
-      'name field' => 'schema_version', // the field to display in the summary.
-    ),
-    'filter' => array(
-      'id' => 'numeric',
-    ),
-    'sort' => array(
-      'id' => 'standard',
-    ),
-  );
-
-  return $data;
-}
diff --git a/views.install b/views.install
index 9469340fdc069c8bdc4580fe1a645357095fe717..5d63efa31bdf86e62c2f8188f269c32196de4241 100644
--- a/views.install
+++ b/views.install
@@ -11,7 +11,7 @@
  * Implements hook_install().
  */
 function views_install() {
-  db_query("UPDATE {system} SET weight = 10 WHERE name = 'views'");
+  module_set_weight('views', 10);
 }
 
 /**