diff --git a/slic/core/scanner/scanbackend.py b/slic/core/scanner/scanbackend.py
index fef49f66..bfb20dfb 100644
--- a/slic/core/scanner/scanbackend.py
+++ b/slic/core/scanner/scanbackend.py
@@ -99,11 +99,13 @@ class ScanBackend:
     def get_filename(self, istep):
         filename = os.path.join(self.data_base_dir, self.filename)
 
-        if self.make_scan_sub_dir:
-            filebase = os.path.basename(self.filename)
-            filename = os.path.join(filename, filebase)
+#TODO: no settable file names in sf_daq, but need it for other methods...
+#        if self.make_scan_sub_dir:
+#            filebase = os.path.basename(self.filename)
+#            filename = os.path.join(filename, filebase)
 
-        filename += "_step{:04d}".format(istep)
+#TODO: sf_daq counts runs
+#        filename += "_step{:04d}".format(istep)
         return filename
 
 
diff --git a/slic/core/scanner/scanner.py b/slic/core/scanner/scanner.py
index 47984c37..99b7439e 100644
--- a/slic/core/scanner/scanner.py
+++ b/slic/core/scanner/scanner.py
@@ -53,7 +53,8 @@ class Scanner:
         Returns:
             ScanBackend: Scan instance.
         """
-        filename = self.filename_generator.get_next_run_filename(filename)
+        #TODO: sf_daq counts runs
+#        filename = self.filename_generator.get_next_run_filename(filename)
 
         if not acquisitions:
             acquisitions = self.default_acquisitions