diff --git a/scripts/runner.pl b/scripts/runner.pl
index c4596da..4eddbd9 100644
--- a/scripts/runner.pl
+++ b/scripts/runner.pl
@@ -63,6 +63,22 @@ sub import_trace {
 
     Util::notify("Importing $experiment trace...");
 
+    # Benchmark: ip
+    system(
+        join " ",
+        (
+            "$fail_import",
+            "--database-option-file $remote_db_conf",
+            "-t $remote_builds_dir/$experiment/trace.pb",
+            "-i RegisterImporter",
+            "-e $remote_builds_dir/$experiment/system.elf",
+            "-v $experiment",
+            "-b ip",
+            "--no-gp",    # Don't inject general purpose registers
+            "--ip"        # Inject instruction pointer
+        )
+    );
+
     # Benchmark: mem
     system(
         join " ",
@@ -92,22 +108,6 @@ sub import_trace {
         )
     );
 
-    # Benchmark: ip
-    system(
-        join " ",
-        (
-            "$fail_import",
-            "--database-option-file $remote_db_conf",
-            "-t $remote_builds_dir/$experiment/trace.pb",
-            "-i RegisterImporter",
-            "-e $remote_builds_dir/$experiment/system.elf",
-            "-v $experiment",
-            "-b ip",
-            "--no-gp",    # Don't inject general purpose registers
-            "--ip"        # Inject instruction pointer
-        )
-    );
-
     # Import fulltrace for VisualFAIL
     system(
         join " ",
@@ -131,51 +131,39 @@ sub import_trace {
             "-i ElfImporter",
             "-e $remote_builds_dir/$experiment/system.elf",
             "-v $experiment",
+            "-b ip",
+            "--objdump objdump",
+            "--sources",
+        )
+    );
+    system(
+        join " ",
+        (
+            "$fail_import",
+            "--database-option-file $remote_db_conf",
+            "-t $remote_builds_dir/$experiment/trace.pb",
+            "-i ElfImporter",
+            "-e $remote_builds_dir/$experiment/system.elf",
+            "-v $experiment",
+            "-b mem",
+            "--objdump objdump",
+            "--sources",
+        )
+    );
+    system(
+        join " ",
+        (
+            "$fail_import",
+            "--database-option-file $remote_db_conf",
+            "-t $remote_builds_dir/$experiment/trace.pb",
+            "-i ElfImporter",
+            "-e $remote_builds_dir/$experiment/system.elf",
+            "-v $experiment",
+            "-b regs",
             "--objdump objdump",
             "--sources",
         )
     );
-
-    # I think those are redundant with the import above?
-    # system(
-    #     join " ",
-    #     (
-    #         "$fail_import",
-    #         "--database-option-file $remote_db_conf",
-    #         "-t $remote_builds_dir/$experiment/trace.pb",
-    #         "-i ElfImporter",
-    #         "--objdump objdump",
-    #         "-e $remote_builds_dir/$experiment/system.elf",
-    #         "-v $experiment",
-    #         "-b ip"
-    #     )
-    # );
-    # system(
-    #     join " ",
-    #     (
-    #         "$fail_import",
-    #         "--database-option-file $remote_db_conf",
-    #         "-t $remote_builds_dir/$experiment/trace.pb",
-    #         "-i ElfImporter",
-    #         "--objdump objdump",
-    #         "-e $remote_builds_dir/$experiment/system.elf",
-    #         "-v $experiment",
-    #         "-b mem"
-    #     )
-    # );
-    # system(
-    #     join " ",
-    #     (
-    #         "$fail_import",
-    #         "--database-option-file $remote_db_conf",
-    #         "-t $remote_builds_dir/$experiment/trace.pb",
-    #         "-i ElfImporter",
-    #         "--objdump objdump",
-    #         "-e $remote_builds_dir/$experiment/system.elf",
-    #         "-v $experiment",
-    #         "-b regs"
-    #     )
-    # );
 
     system(
         join " ",