diff --git a/core/modules/aggregator/src/Tests/AggregatorTestBase.php b/core/modules/aggregator/src/Tests/AggregatorTestBase.php
index 13f0a77..b05951e 100644
--- a/core/modules/aggregator/src/Tests/AggregatorTestBase.php
+++ b/core/modules/aggregator/src/Tests/AggregatorTestBase.php
@@ -148,7 +148,7 @@ public function getFeedEditObject($feed_url = NULL, array $values = array()) {
    */
   public function getDefaultFeedItemCount() {
     // Our tests are based off of rss.xml, so let's find out how many elements should be related.
-    $feed_count = db_query_range('SELECT COUNT(DISTINCT nid) FROM {node_field_data} n WHERE n.promote = 1 AND n.status = 1', 0, $this->config('system.rss')->get('items.limit'))->fetchField();
+    $feed_count = db_query_range('SELECT COUNT(DISTINCT nid) FROM {node_field_data} n WHERE n.promote = 1 AND n.status = 1', 0, 10)->fetchField();
     return $feed_count > 10 ? 10 : $feed_count;
   }
 
@@ -375,4 +375,5 @@ public function enableTestPlugins() {
       ))
       ->save();
   }
+
 }
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
index e611478..f3621bd 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
@@ -22,6 +22,7 @@
  * Visit all lists.
  *
  * @group config_translation
+ *
  * @see \Drupal\config_translation\Tests\ConfigTranslationViewListUiTest
  */
 class ConfigTranslationListUiTest extends WebTestBase {
@@ -54,6 +55,9 @@ class ConfigTranslationListUiTest extends WebTestBase {
    */
   protected $adminUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
 
@@ -126,7 +130,7 @@ protected function doMenuListTest() {
     $edit = array(
       'id' => $menu_name,
       'description' => '',
-      'label' =>  $label,
+      'label' => $label,
     );
     // Create the menu by posting the form.
     $this->drupalPostForm('admin/structure/menu/add', $edit, t('Save'));
@@ -194,7 +198,7 @@ public function doCustomContentTypeListTest() {
     $block_content_type = BlockContentType::create(array(
       'id' => Unicode::strtolower($this->randomMachineName(16)),
       'label' => $this->randomMachineName(),
-      'revision' => FALSE
+      'revision' => FALSE,
     ));
     $block_content_type->save();
 
@@ -400,7 +404,7 @@ public function doFieldListTest() {
     $block_content_type = BlockContentType::create(array(
       'id' => 'basic',
       'label' => 'Basic',
-      'revision' => FALSE
+      'revision' => FALSE,
     ));
     $block_content_type->save();
     $field = FieldConfig::create([
@@ -494,16 +498,13 @@ public function testTranslateOperationInListUi() {
     $this->doDateFormatListTest();
     $this->doFieldListTest();
 
-    // Views is tested in Drupal\config_translation\Tests\ConfigTranslationViewListUiTest
-
+    // Views is tested in Drupal\config_translation\Tests\ConfigTranslationViewListUiTest.
     // Test the maintenance settings page.
     $this->doSettingsPageTest('admin/config/development/maintenance');
     // Test the site information settings page.
     $this->doSettingsPageTest('admin/config/system/site-information');
     // Test the account settings page.
     $this->doSettingsPageTest('admin/config/people/accounts');
-    // Test the RSS settings page.
-    $this->doSettingsPageTest('admin/config/services/rss-publishing');
   }
 
 }
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
index cb7e0d1..fb61e12 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
@@ -75,6 +75,9 @@ class ConfigTranslationUiTest extends WebTestBase {
    */
   protected $localeStorage;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
     $translator_permissions = [
@@ -428,7 +431,7 @@ public function testDateFormatTranslation() {
       'medium' => 'Default medium date',
       'custom_medium' => 'Custom medium date',
     );
-    foreach($formats as $id => $label) {
+    foreach ($formats as $id => $label) {
       $translation_base_url = 'admin/config/regional/date-time/formats/manage/' . $id . '/translate';
 
       $this->drupalGet($translation_base_url);
@@ -498,7 +501,7 @@ public function testAccountSettingsConfigurationTranslation() {
     $this->drupalGet('admin/config/people/accounts/translate/fr/edit');
     foreach ($edit as $key => $value) {
       // Check the translations appear in the right field type as well.
-      $xpath = '//' . (strpos($key, '[body]') ? 'textarea' : 'input') . '[@name="'. $key . '"]';
+      $xpath = '//' . (strpos($key, '[body]') ? 'textarea' : 'input') . '[@name="' . $key . '"]';
       $this->assertFieldByXPath($xpath, $value);
     }
     // Check that labels for email settings appear.
@@ -618,7 +621,8 @@ public function testPluralConfigStringsSourceElements() {
     );
 
     foreach ($languages as $langcode => $data) {
-      // Import a .po file to add a new language with a given number of plural forms
+      // Import a .po file to add a new language with a given number of plural
+      // forms.
       $name = tempnam('temporary://', $langcode . '_') . '.po';
       file_put_contents($name, $this->getPoFile($data['plurals']));
       $this->drupalPostForm('admin/config/regional/translate/import', array(
@@ -811,7 +815,7 @@ public function testLocaleDBStorage() {
     $translation = $this->getTranslation('user.settings', 'anonymous', 'fr');
     $this->assertEqual('Anonyme', $translation->getString());
 
-    // revert custom translations to base translation.
+    // Revert custom translations to base translations.
     $edit = array(
       'translation[config_names][user.settings][anonymous]' => 'Anonymous',
     );
@@ -828,7 +832,7 @@ public function testLocaleDBStorage() {
   public function testSingleLanguageUI() {
     $this->drupalLogin($this->adminUser);
 
-    // Delete French language
+    // Delete French language.
     $this->drupalPostForm('admin/config/regional/language/delete/fr', array(), t('Delete'));
     $this->assertRaw(t('The %language (%langcode) language has been removed.', array('%language' => 'French', '%langcode' => 'fr')));
 
@@ -839,7 +843,7 @@ public function testSingleLanguageUI() {
     $this->drupalPostForm('admin/config/regional/language', $edit, t('Save configuration'));
     $this->assertRaw(t('Configuration saved.'));
 
-    // Delete English language
+    // Delete English language.
     $this->drupalPostForm('admin/config/regional/language/delete/en', array(), t('Delete'));
     $this->assertRaw(t('The %language (%langcode) language has been removed.', array('%language' => 'English', '%langcode' => 'en')));
 
@@ -858,11 +862,6 @@ public function testAlterInfo() {
     $this->container->get('state')->set('config_translation_test_config_translation_info_alter', TRUE);
     $this->container->get('plugin.manager.config_translation.mapper')->clearCachedDefinitions();
 
-    // Check out if the translation page has the altered in settings.
-    $this->drupalGet('admin/config/system/site-information/translate/fr/add');
-    $this->assertText(t('Feed channel'));
-    $this->assertText(t('Feed description'));
-
     // Check if the translation page does not have the altered out settings.
     $this->drupalGet('admin/config/people/accounts/translate/fr/add');
     $this->assertText(t('Name'));
@@ -881,7 +880,7 @@ public function testSequenceTranslation() {
     $expected = array(
       'kitten',
       'llama',
-      'elephant'
+      'elephant',
     );
     $actual = $config_factory
       ->getEditable('config_translation_test.content')
diff --git a/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php b/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
index 4d5765f..9c96750 100644
--- a/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
+++ b/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
@@ -88,6 +88,9 @@ class ConfigNamesMapperTest extends UnitTestCase {
    */
   protected $languageManager;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     $this->routeProvider = $this->getMock('Drupal\Core\Routing\RouteProviderInterface');
 
@@ -440,7 +443,8 @@ public function testGetLangcode() {
       $this->configNamesMapper->getLangcode();
       $this->fail();
     }
-    catch (\RuntimeException $e) {}
+    catch (\RuntimeException $e) {
+    }
   }
 
   /**
@@ -458,7 +462,6 @@ public function testGetConfigData() {
       ),
       'system.rss' => array(
         'items' => array(
-          'limit' => 10,
           'view_mode' => 'rss',
         ),
       ),
diff --git a/core/modules/system/config/install/system.rss.yml b/core/modules/system/config/install/system.rss.yml
index 994f55c..5be24e2 100644
--- a/core/modules/system/config/install/system.rss.yml
+++ b/core/modules/system/config/install/system.rss.yml
@@ -1,6 +1,3 @@
-channel:
-  description: ''
 items:
-  limit: 10
   view_mode: rss
 langcode: en
diff --git a/core/modules/system/config/schema/system.schema.yml b/core/modules/system/config/schema/system.schema.yml
index e34d375..75ad88c 100644
--- a/core/modules/system/config/schema/system.schema.yml
+++ b/core/modules/system/config/schema/system.schema.yml
@@ -197,20 +197,10 @@ system.rss:
   type: config_object
   label: 'Feed settings'
   mapping:
-    channel:
-      type: mapping
-      label: 'Feed channel'
-      mapping:
-        description:
-          type: text
-          label: 'Feed description'
     items:
       type: mapping
       label: 'Feed items'
       mapping:
-        limit:
-          type: integer
-          label: 'Feed item limit'
         view_mode:
           type: string
           label: 'Feed content'
diff --git a/core/modules/system/migration_templates/d6_system_rss.yml b/core/modules/system/migration_templates/d6_system_rss.yml
index d112e82..2e7ff4e 100644
--- a/core/modules/system/migration_templates/d6_system_rss.yml
+++ b/core/modules/system/migration_templates/d6_system_rss.yml
@@ -5,10 +5,8 @@ migration_tags:
 source:
   plugin: variable
   variables:
-    - feed_default_items
     - feed_item_length
 process:
-  'items/limit': feed_default_items
   'items/view_mode': feed_item_length
 destination:
   plugin: config
diff --git a/core/modules/system/src/Form/RssFeedsForm.php b/core/modules/system/src/Form/RssFeedsForm.php
index cde9964..df8cafd 100644
--- a/core/modules/system/src/Form/RssFeedsForm.php
+++ b/core/modules/system/src/Form/RssFeedsForm.php
@@ -33,31 +33,16 @@ protected function getEditableConfigNames() {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $rss_config = $this->config('system.rss');
-    $form['feed_description'] = array(
-      '#type' => 'textarea',
-      '#title' => t('Feed description'),
-      '#default_value' => $rss_config->get('channel.description'),
-      '#description' => t('Description of your site, included in each feed.')
-    );
-    $options = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30);
-    $form['feed_default_items'] = array(
-      '#type' => 'select',
-      '#title' => t('Number of items in each feed'),
-      '#default_value' => $rss_config->get('items.limit'),
-      '#options' => array_combine($options, $options),
-      '#description' => t('Default number of items to include in each feed.')
-    );
     $form['feed_view_mode'] = array(
       '#type' => 'select',
       '#title' => t('Feed content'),
-      '#default_value' => $rss_config->get('items.view_mode'),
+      '#default_value' => $this->config('system.rss')->get('items.view_mode'),
       '#options' => array(
         'title' => t('Titles only'),
         'teaser' => t('Titles plus teaser'),
         'fulltext' => t('Full text'),
       ),
-      '#description' => t('Global setting for the default display of content items in each feed.')
+      '#description' => t('Global setting for the default display of content items in each feed.'),
     );
 
     return parent::buildForm($form, $form_state);
@@ -68,8 +53,6 @@ public function buildForm(array $form, FormStateInterface $form_state) {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->config('system.rss')
-      ->set('channel.description', $form_state->getValue('feed_description'))
-      ->set('items.limit', $form_state->getValue('feed_default_items'))
       ->set('items.view_mode', $form_state->getValue('feed_view_mode'))
       ->save();
 
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php
index 3e59289..e097da1 100644
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php
@@ -29,7 +29,6 @@ protected function setUp() {
    */
   public function testSystemRss() {
     $config = $this->config('system.rss');
-    $this->assertIdentical(10, $config->get('items.limit'));
     $this->assertIdentical('title', $config->get('items.view_mode'));
   }
 
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 44212b1..1a8bb7d 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -1624,10 +1624,29 @@ function system_update_8013() {
  * @{
  */
 
+/*
+ * Remove meaningless configuration from system.rss.
+ */
+function system_update_8015() {
+  \Drupal::configFactory()->getEditable('system.rss')
+    ->clear('channel')
+    ->clear('items.limit')
+    ->save();
+}
+
+/**
+ * @} End of "addtogroup updates-8.0.0-rc".
+ */
+
+/**
+ * @addtogroup updates-8.1.0
+ * @{
+ */
+
 /**
  * Install the Stable base theme if needed.
  */
-function system_update_8014() {
+function system_update_8100() {
   $theme_handler = \Drupal::service('theme_handler');
   if ($theme_handler->themeExists('stable')) {
     return;
@@ -1644,5 +1663,5 @@ function system_update_8014() {
 }
 
 /**
- * @} End of "addtogroup updates-8.0.0-rc".
+ * @} End of "addtogroup updates-8.1.0".
  */