diff --git a/src/Forms/Form.php b/src/Forms/Form.php
index 07c4fc9eda2..c53d6d51d7a 100644
--- a/src/Forms/Form.php
+++ b/src/Forms/Form.php
@@ -1338,32 +1338,8 @@ public function validate(): ValidationResult
      * form that has some fields that save to one object, and some that save to another.
      * @return $this
      */
-    public function loadDataFrom($data, $mergeStrategy = 0, $fieldList = null)
+    public function loadDataFrom(object|array $data, int $mergeStrategy = 0, array $fieldList = [])
     {
-        if (!is_object($data) && !is_array($data)) {
-            user_error("Form::loadDataFrom() not passed an array or an object", E_USER_WARNING);
-            return $this;
-        }
-
-        // Handle the backwards compatible case of passing "true" as the second argument
-        if ($mergeStrategy === true) {
-            Deprecation::notice(
-                '5.4.0',
-                'Passing `true` to the $mergeStrategy argument in ' . Form::class . '::loadDataFrom() is deprecated.'
-                    . ' Pass ' . Form::class . '::MERGE_CLEAR_MISSING instead.',
-                Deprecation::SCOPE_GLOBAL
-            );
-            $mergeStrategy = Form::MERGE_CLEAR_MISSING;
-        } elseif ($mergeStrategy === false) {
-            Deprecation::notice(
-                '5.4.0',
-                'Passing `false` to the $mergeStrategy argument in ' . Form::class . '::loadDataFrom() is deprecated.'
-                    . ' Pass 0 instead.',
-                Deprecation::SCOPE_GLOBAL
-            );
-            $mergeStrategy = 0;
-        }
-
         // If an object is passed, save it for historical reference through {@link getRecord()}
         // Also use this to determine if we are loading a submitted form, or loading
         // from a record
@@ -1392,7 +1368,7 @@ public function loadDataFrom($data, $mergeStrategy = 0, $fieldList = null)
             $name = $field->getName();
 
             // Skip fields that have been excluded
-            if ($fieldList && !in_array($name, $fieldList ?? [])) {
+            if (!empty($fieldList) && !in_array($name, $fieldList)) {
                 continue;
             }
 
diff --git a/src/ORM/Connect/MySQLDatabase.php b/src/ORM/Connect/MySQLDatabase.php
index 075c44eaf4f..45efc2482ea 100644
--- a/src/ORM/Connect/MySQLDatabase.php
+++ b/src/ORM/Connect/MySQLDatabase.php
@@ -207,16 +207,9 @@ public function searchEngine(
             }
         }
 
-        // Always ensure that only pages with ShowInSearch = 1 can be searched
+        // Always ensure that only pages/files with ShowInSearch = 1 can be searched
         $extraFilters[$pageClass] .= " AND ShowInSearch <> 0";
-
-        // File.ShowInSearch was added later, keep the database driver backwards compatible
-        // by checking for its existence first
-        $fileTable = DataObject::getSchema()->tableName($fileClass);
-        $fields = $this->getSchemaManager()->fieldList($fileTable);
-        if (array_key_exists('ShowInSearch', $fields ?? [])) {
-            $extraFilters[$fileClass] .= " AND ShowInSearch <> 0";
-        }
+        $extraFilters[$fileClass] .= " AND ShowInSearch <> 0";
 
         $limit = (int)$start . ", " . (int)$pageLength;