diff -u b/core/includes/install.core.inc b/core/includes/install.core.inc
--- b/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -328,7 +328,7 @@
       ->addArgument(new Reference('config.storage'))
       ->addArgument(new Reference('dispatcher'));
     $container->register('keyvalue', 'Drupal\Core\KeyValueStore\KeyValueFactory')
-      ->addArgument(new Reference('service_container'));;
+      ->addArgument(new Reference('service_container'));
     $container->register('keyvalue.memory', 'Drupal\Core\KeyValueStore\KeyValueMemoryFactory');
     // Override the default keyvalue storage to use memory as the database is
     // not available.
diff -u b/core/modules/system/system.install b/core/modules/system/system.install
--- b/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -2194,23 +2194,15 @@
 }
 
 /**
- * Removes the drupal_js_cache_files variable.
+ * Removes the drupal_js_cache_files and css_js_query_string variables.
  *
  * @ingroup config_upgrade
  */
 function system_update_8032() {
   update_variable_del('drupal_js_cache_files');
-}
-
-/**
- * Cleans up css_js_query_string variable.
- *
- * @ingroup state_upgrade
- */
-/*function system_update_8033() {
   update_variable_del('css_js_query_string');
 }
-*/
+
 /**
  * @} End of "defgroup updates-7.x-to-8.x".
  * The next series of updates should start at 9000.