diff --git a/core/modules/content_translation/content_translation.admin.inc b/core/modules/content_translation/content_translation.admin.inc
index a568182..9f07191 100644
--- a/core/modules/content_translation/content_translation.admin.inc
+++ b/core/modules/content_translation/content_translation.admin.inc
@@ -299,7 +299,7 @@ function content_translation_form_language_content_settings_submit(array $form,
   // marked as non-translatable. Similarly, if a bundle is made non-translatable
   // all of its fields will be not translatable.
   foreach ($settings as $entity_type => &$entity_settings) {
-    foreach ($entity_settings as $bundle => &$bundle_settings) {
+    foreach ($entity_settings as &$bundle_settings) {
       if (!empty($bundle_settings['translatable'])) {
         $bundle_settings['translatable'] = $bundle_settings['translatable'] && $entity_types[$entity_type];
       }
@@ -338,7 +338,7 @@ function _content_translation_update_field_translatability($settings) {
   //   track translatability. See https://drupal.org/node/2018685.
   foreach ($settings as $entity_type => $entity_settings) {
     $fields = array();
-    foreach ($entity_settings as $bundle => $bundle_settings) {
+    foreach ($entity_settings as $bundle_settings) {
       // Collapse field settings since here we have per instance settings, but
       // translatability has per-field scope. We assume that all the field
       // instances have the same value.
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index b3c54b3..0574b23 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -502,16 +502,6 @@
 # $settings['maintenance_theme'] = 'bartik';
 
 /**
- * Enable access to rebuild.php.
- *
- * This setting can be enabled to allow Drupal's php and database cached
- * storage to be cleared via the rebuild.php page. Access to this page can also
- * be gained by generating a query string from rebuild_token_calculator.sh and
- * using these parameters in a request to rebuild.php.
- */
-# $settings['rebuild_access'] = TRUE;
-
-/**
  * Base URL (optional).
  *
  * If Drupal is generating incorrect URLs on your site, which could