diff --git a/CRM/Case/Export/Form/Map.php b/CRM/Case/Export/Form/Map.php
deleted file mode 100644
index 7af90c3bf..000000000
--- a/CRM/Case/Export/Form/Map.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/**
- * Class added for exporting cases.
- *
- * Added temporarily for solving an incompatibility issue while exporting
- * cases in standalone window.
- */
-class CRM_Case_Export_Form_Map extends CRM_Export_Form_Map {
-
-}
diff --git a/CRM/Case/Export/Form/Select.php b/CRM/Case/Export/Form/Select.php
deleted file mode 100644
index 7f590b84b..000000000
--- a/CRM/Case/Export/Form/Select.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-/**
- * Class added for exporting cases.
- *
- * Added temporarily for solving an incompatibility issue while exporting
- * cases in standalone window.
- */
-class CRM_Case_Export_Form_Select extends CRM_Export_Form_Select_Case {
-}
diff --git a/api/v3/Case/Getdetails.php b/api/v3/Case/Getdetails.php
index 7622de2c2..6bcd2739e 100644
--- a/api/v3/Case/Getdetails.php
+++ b/api/v3/Case/Getdetails.php
@@ -70,16 +70,16 @@ function _civicrm_api3_case_getdetails_spec(array &$spec) {
  * @throws API_Exception
  */
 function civicrm_api3_case_getdetails(array $params) {
-  list(
+  [
     'resultMetadata' => $resultMetadata,
     'params' => $params,
     'toReturn' => $toReturn,
-    'sql' => $sql
-  ) = CaseDetailsQuery::get($params);
+    'sql' => $sql,
+  ] = CaseDetailsQuery::get($params);
 
   // Call the case api.
   $result = civicrm_api3_case_get(['sequential' => 0] + $params, $sql);
-  if (!empty($result['values'])) {
+  if (!empty($result['values']) && is_array($result['values'])) {
     $ids = array_keys($result['values']);
 
     // Remove legacy cruft.