diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
index 6b2e053..dd4c028 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
@@ -283,10 +283,7 @@ protected function attachLoad(&$queried_entities, $revision_id = FALSE) {
    */
   public function create(array $values) {
     $class = $this->entityInfo['class'];
-if (empty($class)) {
-  error_log(print_r($this->entityInfo, TRUE));
-  error_log(print_r($values, TRUE));
-}
+
     $entity = new $class($values, $this->entityType);
     // Mark this entity as new, so isNew() returns TRUE. This does not check
     // whether a configuration entity with the same ID (if any) already exists.
diff --git a/core/lib/Drupal/Core/Entity/DatabaseStorageController.php b/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
index 949d303..198d67a 100644
--- a/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
+++ b/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
@@ -297,7 +297,7 @@ public function deleteRevision($revision_id) {
         throw new EntityStorageException('Default revision can not be deleted');
       }
 
-      $this->databasedelete($this->revisionTable)
+      $this->database->delete($this->revisionTable)
         ->condition($this->revisionKey, $revision->getRevisionId())
         ->execute();
       $this->invokeHook('revision_delete', $revision);
@@ -493,7 +493,7 @@ public function delete(array $entities) {
       // If no IDs or invalid IDs were passed, do nothing.
       return;
     }
-    $transaction = $this->databasetransaction();
+    $transaction = $this->database->startTransaction();
 
     try {
       $this->preDelete($entities);
@@ -502,12 +502,12 @@ public function delete(array $entities) {
       }
       $ids = array_keys($entities);
 
-      $this->databasedelete($this->entityInfo['base_table'])
+      $this->database->delete($this->entityInfo['base_table'])
         ->condition($this->idKey, $ids, 'IN')
         ->execute();
 
       if ($this->revisionKey) {
-        $this->databasedelete($this->revisionTable)
+        $this->database->delete($this->revisionTable)
           ->condition($this->idKey, $ids, 'IN')
           ->execute();
       }
@@ -611,7 +611,7 @@ protected function saveRevision(EntityInterface $entity) {
     if ($entity->isNewRevision()) {
       drupal_write_record($this->revisionTable, $record);
       if ($entity->isDefaultRevision()) {
-        $this->databaseupdate($this->entityInfo['base_table'])
+        $this->database->update($this->entityInfo['base_table'])
           ->fields(array($this->revisionKey => $record[$this->revisionKey]))
           ->condition($this->idKey, $entity->id())
           ->execute();