diff --git a/langkit/support/langkit_support-adalog-generic_main_support.adb b/langkit/support/langkit_support-adalog-generic_main_support.adb
index a5534d7e6..2134baac1 100644
--- a/langkit/support/langkit_support-adalog-generic_main_support.adb
+++ b/langkit/support/langkit_support-adalog-generic_main_support.adb
@@ -3,8 +3,6 @@
 --  SPDX-License-Identifier: Apache-2.0
 --
 
-with Ada.Command_Line;
-with Ada.Environment_Variables;
 with Ada.Exceptions; use Ada.Exceptions;
 with Ada.Text_IO;    use Ada.Text_IO;
 with Ada.Unchecked_Deallocation;
@@ -17,14 +15,6 @@ package body Langkit_Support.Adalog.Generic_Main_Support is
    procedure Free is new Ada.Unchecked_Deallocation
      (Logic_Var_Record, Refs.Logic_Var);
 
-   --  The following booleans determine which solver configurations to run in
-   --  tests. The ``Setup_Traces`` procedure initializes them with default
-   --  values, possibly modified depending on environment variables, for
-   --  convenience when debugging tests.
-
-   Run_Sym_Without_Opts : Boolean;
-   Run_Sym_With_Opts    : Boolean;
-
    ------------
    -- Create --
    ------------
@@ -81,14 +71,7 @@ package body Langkit_Support.Adalog.Generic_Main_Support is
       procedure Free (Self : in out Solution_Vectors.Vector);
       --  Free all solutions in Self and destroy the vector
 
-      function Equivalent
-        (Left, Right : Solution_Vectors.Vector) return Boolean;
-      --  Return whether the two vectors of solutions are equal
-
-      Solutions              : Solution_Vectors.Vector :=
-        Solution_Vectors.Empty_Vector;
-      Solutions_Without_Opts : Solution_Vectors.Vector :=
-        Solution_Vectors.Empty_Vector;
+      Solutions : Solution_Vectors.Vector := Solution_Vectors.Empty_Vector;
 
       function Solution_Callback (Vars : Logic_Var_Array) return Boolean;
       --  Callback for ``Solve``. Print the given solution and append it to
@@ -116,46 +99,6 @@ package body Langkit_Support.Adalog.Generic_Main_Support is
          Self.Destroy;
       end Free;
 
-      ----------------
-      -- Equivalent --
-      ----------------
-
-      function Equivalent
-        (Left, Right : Solution_Vectors.Vector) return Boolean
-      is
-      begin
-         if Left.Length /= Right.Length then
-            return False;
-         end if;
-
-         for I in 1 .. Left.Length loop
-            declare
-               S_L : Solution renames Left.Get (I).all;
-               S_R : Solution renames Right.Get (I).all;
-            begin
-               if S_L'Length /= S_R'Length then
-                  return False;
-               end if;
-
-               for J in S_L'Range loop
-                  declare
-                     L : Var_And_Val renames S_L (J);
-                     R : Var_And_Val renames S_R (J);
-                  begin
-                     if Refs."/=" (L.Var, R.Var)
-                        or else L.Defined /= R.Defined
-                        or else (L.Defined and then L.Val /= R.Val)
-                     then
-                        return False;
-                     end if;
-                  end;
-               end loop;
-            end;
-         end loop;
-
-         return True;
-      end Equivalent;
-
       -----------------------
       -- Solution_Callback --
       -----------------------
@@ -198,42 +141,15 @@ package body Langkit_Support.Adalog.Generic_Main_Support is
    begin
       Put_Line ("Solving relation:");
       Put_Line (Image (Rel));
-
-      --  Solve both without and with optimizations
-
-      if Run_Sym_Without_Opts then
-         Put_Line ("... without optimizations:");
-         Run_Solve ((others => False));
-         New_Line;
-         Solutions_Without_Opts := Solutions;
-         Solutions := Solution_Vectors.Empty_Vector;
-      end if;
-
-      if Run_Sym_With_Opts then
-         Put_Line ("... with all optimizations:");
-         Run_Solve ((others => True));
-         New_Line;
-      end if;
-
-      --  Check that we had the same results in both cases
-
-      if Run_Sym_Without_Opts
-         and then Run_Sym_With_Opts
-         and then not Equivalent (Solutions_Without_Opts, Solutions)
-      then
-         Put_Line ("ERROR: solutions are not the same");
-         New_Line;
-         Ada.Command_Line.Set_Exit_Status (Ada.Command_Line.Failure);
-      end if;
+      Run_Solve (Default_Options);
+      New_Line;
 
       --  Clean up, we are done
 
-      Free (Solutions_Without_Opts);
       Free (Solutions);
 
    exception
       when others =>
-         Free (Solutions_Without_Opts);
          Free (Solutions);
          raise;
    end Solve_All;
@@ -255,38 +171,11 @@ package body Langkit_Support.Adalog.Generic_Main_Support is
 
    procedure Run_Main (Main : access procedure) is
    begin
-      Setup_Traces;
+      GNATCOLL.Traces.Parse_Config_File;
       Main.all;
       Finalize;
    end Run_Main;
 
-   ------------------
-   -- Setup_Traces --
-   ------------------
-
-   procedure Setup_Traces is
-      package Env renames Ada.Environment_Variables;
-      Var_Name : constant String := "ADALOG_SOLVER_CFG";
-      Cfg      : constant String := Env.Value (Var_Name, Default => "");
-   begin
-      GNATCOLL.Traces.Parse_Config_File;
-
-      Run_Sym_Without_Opts := False;
-      Run_Sym_With_Opts := False;
-
-      if Cfg = "" then
-         Run_Sym_Without_Opts := True;
-         Run_Sym_With_Opts := True;
-      elsif Cfg = "sym" then
-         Run_Sym_Without_Opts := True;
-      elsif Cfg = "sym-opts" then
-         Run_Sym_With_Opts := True;
-      else
-         raise Program_Error
-           with "Invalid value for env var """ & Var_Name & """";
-      end if;
-   end Setup_Traces;
-
    --------------
    -- Finalize --
    --------------
diff --git a/langkit/support/langkit_support-adalog-generic_main_support.ads b/langkit/support/langkit_support-adalog-generic_main_support.ads
index 0743205a1..bde8caea6 100644
--- a/langkit/support/langkit_support-adalog-generic_main_support.ads
+++ b/langkit/support/langkit_support-adalog-generic_main_support.ads
@@ -103,7 +103,6 @@ package Langkit_Support.Adalog.Generic_Main_Support is
    procedure Solve_All (Rel : Relation; Timeout : Natural := 0);
 
    procedure Run_Main (Main : access procedure);
-   procedure Setup_Traces;
    procedure Finalize;
 
 private
diff --git a/langkit/support/langkit_support-adalog.ads b/langkit/support/langkit_support-adalog.ads
index 37d55b8d7..58761b91d 100644
--- a/langkit/support/langkit_support-adalog.ads
+++ b/langkit/support/langkit_support-adalog.ads
@@ -18,13 +18,9 @@ package Langkit_Support.Adalog is
    -- Solving options --
    ---------------------
 
-   type Solve_Options_Type is record
-      Cut_Dead_Branches : Boolean := True;
-      --  Whether to enable an optimization that will cut branches that
-      --  necessarily contain falsy solutions.
-   end record;
+   type Solve_Options_Type is null record;
 
-   Default_Options : Solve_Options_Type := (others => <>);
+   Default_Options : Solve_Options_Type;
    --  Mutate this to affect the behavior of all calls to the solver which just
    --  use the default options.
 
@@ -88,10 +84,4 @@ package Langkit_Support.Adalog is
    --  * the number of tried solutions;
    --  * valid solutions found.
 
-   Cst_Folding_Trace : GNATCOLL.Traces.Trace_Handle := GNATCOLL.Traces.Create
-     ("LANGKIT.SOLVER.CONSTANT_FOLDING",
-      Default => GNATCOLL.Traces.From_Config);
-   --  Trace to show the result of relation constant folding pass done during
-   --  the preparation stage in the symbolic solver.
-
 end Langkit_Support.Adalog;
diff --git a/testsuite/tests/adalog/any_false/test.out b/testsuite/tests/adalog/any_false/test.out
index 02291c2ef..277c53d74 100644
--- a/testsuite/tests/adalog/any_false/test.out
+++ b/testsuite/tests/adalog/any_false/test.out
@@ -3,10 +3,6 @@ Any:
     False
     %X <- 12
 
-... without optimizations:
-Solution: [%X = 12]
-
-... with all optimizations:
 Solution: [%X = 12]
 
 Done.
diff --git a/testsuite/tests/adalog/any_left/test.out b/testsuite/tests/adalog/any_left/test.out
index 52cda55e0..459294054 100644
--- a/testsuite/tests/adalog/any_left/test.out
+++ b/testsuite/tests/adalog/any_left/test.out
@@ -3,7 +3,6 @@ All:
     %X <- 12
     Is_Even?(%X)
 
-... with all optimizations:
 Solution: [%X = 12]
 
 Solving relation:
@@ -15,7 +14,6 @@ All:
 
     Is_Even?(%X)
 
-... with all optimizations:
 Solution: [%X = 2]
 
 Solving relation:
@@ -28,7 +26,6 @@ All:
 
     Is_Even?(%X)
 
-... with all optimizations:
 Solution: [%X = 2]
 Solution: [%X = 4]
 
@@ -39,7 +36,6 @@ Any:
     %X <- 3
     %X <- 4
 
-... with all optimizations:
 Solution: [%X = 1]
 Solution: [%X = 2]
 Solution: [%X = 3]
diff --git a/testsuite/tests/adalog/custom_bind/test.out b/testsuite/tests/adalog/custom_bind/test.out
index a8be7c7d1..9db5aeae1 100644
--- a/testsuite/tests/adalog/custom_bind/test.out
+++ b/testsuite/tests/adalog/custom_bind/test.out
@@ -10,15 +10,6 @@ All:
 
     %Y <- Square(%X)
 
-... without optimizations:
-Solution: [%X = 1, %Y = 1]
-Solution: [%X = 2, %Y = 4]
-Solution: [%X = 3, %Y = 9]
-Solution: [%X = 4, %Y = 16]
-Solution: [%X = 5, %Y = 25]
-Solution: [%X = 6, %Y = 36]
-
-... with all optimizations:
 Solution: [%X = 1, %Y = 1]
 Solution: [%X = 2, %Y = 4]
 Solution: [%X = 3, %Y = 9]
@@ -39,10 +30,6 @@ All:
     %Y <- Square(%X)
     %Y <- 36
 
-... without optimizations:
-Solution: [%X = 6, %Y = 36]
-
-... with all optimizations:
 Solution: [%X = 6, %Y = 36]
 
 Done.
diff --git a/testsuite/tests/adalog/debug_image/test.out b/testsuite/tests/adalog/debug_image/test.out
index 6b51f5c62..6f53c6db0 100644
--- a/testsuite/tests/adalog/debug_image/test.out
+++ b/testsuite/tests/adalog/debug_image/test.out
@@ -9,12 +9,6 @@ All:
         %X <- 3 main.adb:28
 
 
-... without optimizations:
-Solution: [%X = 1, %Y = 1]
-Solution: [%X = 2, %Y = 2]
-Solution: [%X = 3, %Y = 3]
-
-... with all optimizations:
 Solution: [%X = 1, %Y = 1]
 Solution: [%X = 2, %Y = 2]
 Solution: [%X = 3, %Y = 3]
@@ -40,12 +34,6 @@ All: main.adb:34
         %Y <- 10 main.adb:34
 
 
-... without optimizations:
-Solution: [%X = 1, %Y = 10]
-Solution: [%X = 2, %Y = 10]
-Solution: [%X = 3, %Y = 10]
-
-... with all optimizations:
 Solution: [%X = 1, %Y = 10]
 Solution: [%X = 2, %Y = 10]
 Solution: [%X = 3, %Y = 10]
@@ -61,9 +49,6 @@ All: main.adb:38
         %X <- 3 main.adb:38
 
 
-... without optimizations:
-
-... with all optimizations:
 
 ========================================================================
 
@@ -72,9 +57,6 @@ All: main.adb:42
     Is_Even?(%Y) main.adb:42
     Is_Even?(%X) main.adb:42
 
-... without optimizations:
-
-... with all optimizations:
 
 ========================================================================
 
@@ -84,11 +66,6 @@ Any: main.adb:45
     %X <- 1 main.adb:45
     %X <- 2 main.adb:45
 
-... without optimizations:
-Solution: [%Y = <undefined>, %X = 1]
-Solution: [%Y = <undefined>, %X = 2]
-
-... with all optimizations:
 Solution: [%Y = <undefined>, %X = 1]
 Solution: [%Y = <undefined>, %X = 2]
 
@@ -99,9 +76,6 @@ Any: main.adb:48
     Is_Even?(%X) main.adb:48
     Is_Even?(%Y) main.adb:48
 
-... without optimizations:
-
-... with all optimizations:
 
 ========================================================================
 
@@ -117,9 +91,6 @@ Any: main.adb:51
         Is_Even?(%Y) main.adb:51
 
 
-... without optimizations:
-
-... with all optimizations:
 
 ========================================================================
 
@@ -136,10 +107,6 @@ All: main.adb:56
 
     %X <-> %Y main.adb:56
 
-... without optimizations:
-Solution: [%X = 2, %Y = 2]
-
-... with all optimizations:
 Solution: [%X = 2, %Y = 2]
 
 Done.
diff --git a/testsuite/tests/adalog/def_cycle/test.out b/testsuite/tests/adalog/def_cycle/test.out
index fc23a5146..2a5a53003 100644
--- a/testsuite/tests/adalog/def_cycle/test.out
+++ b/testsuite/tests/adalog/def_cycle/test.out
@@ -4,10 +4,6 @@ All:
     %X <- %Y
     %X <- 1
 
-... without optimizations:
-Solution: [%Y = 1, %X = 1]
-
-... with all optimizations:
 Solution: [%Y = 1, %X = 1]
 
 Done.
diff --git a/testsuite/tests/adalog/def_cycle_error/test.out b/testsuite/tests/adalog/def_cycle_error/test.out
index 55f792e28..032bca0e2 100644
--- a/testsuite/tests/adalog/def_cycle_error/test.out
+++ b/testsuite/tests/adalog/def_cycle_error/test.out
@@ -4,8 +4,5 @@ All:
     %Z <- %Y
     %X <- %Z
 
-... without optimizations:
-
-... with all optimizations:
 
 Done.
diff --git a/testsuite/tests/adalog/def_twice/test.out b/testsuite/tests/adalog/def_twice/test.out
index d22c28f85..95ac25d35 100644
--- a/testsuite/tests/adalog/def_twice/test.out
+++ b/testsuite/tests/adalog/def_twice/test.out
@@ -11,10 +11,6 @@ All:
     %X <- 1
     Is_Odd?(%X)
 
-... without optimizations:
-Solution: [%X = 1]
-
-... with all optimizations:
 Solution: [%X = 1]
 
 Done.
diff --git a/testsuite/tests/adalog/deferred_predicate/test.out b/testsuite/tests/adalog/deferred_predicate/test.out
index b593e58ed..193c9e582 100644
--- a/testsuite/tests/adalog/deferred_predicate/test.out
+++ b/testsuite/tests/adalog/deferred_predicate/test.out
@@ -10,12 +10,6 @@ All:
         %X <- 6
 
 
-... without optimizations:
-Solution: [%X = 2]
-Solution: [%X = 4]
-Solution: [%X = 6]
-
-... with all optimizations:
 Solution: [%X = 2]
 Solution: [%X = 4]
 Solution: [%X = 6]
diff --git a/testsuite/tests/adalog/domain/test.out b/testsuite/tests/adalog/domain/test.out
index 03c85e96a..6883a01bb 100644
--- a/testsuite/tests/adalog/domain/test.out
+++ b/testsuite/tests/adalog/domain/test.out
@@ -7,15 +7,6 @@ Any:
     %X <- 5
     %X <- 6
 
-... without optimizations:
-Solution: [%X = 1]
-Solution: [%X = 2]
-Solution: [%X = 3]
-Solution: [%X = 4]
-Solution: [%X = 5]
-Solution: [%X = 6]
-
-... with all optimizations:
 Solution: [%X = 1]
 Solution: [%X = 2]
 Solution: [%X = 3]
diff --git a/testsuite/tests/adalog/domain_comb/test.out b/testsuite/tests/adalog/domain_comb/test.out
index 60466c99a..87e465c31 100644
--- a/testsuite/tests/adalog/domain_comb/test.out
+++ b/testsuite/tests/adalog/domain_comb/test.out
@@ -14,12 +14,6 @@ All:
         %X <- 5
 
 
-... without optimizations:
-Solution: [%X = 3]
-Solution: [%X = 4]
-Solution: [%X = 5]
-
-... with all optimizations:
 Solution: [%X = 3]
 Solution: [%X = 4]
 Solution: [%X = 5]
diff --git a/testsuite/tests/adalog/domain_eq/test.out b/testsuite/tests/adalog/domain_eq/test.out
index b326e21e9..adbfe86e5 100644
--- a/testsuite/tests/adalog/domain_eq/test.out
+++ b/testsuite/tests/adalog/domain_eq/test.out
@@ -9,17 +9,6 @@ Any:
     %X <- 7
     %X <- 8
 
-... without optimizations:
-Solution: [%X = 1]
-Solution: [%X = 2]
-Solution: [%X = 3]
-Solution: [%X = 4]
-Solution: [%X = 5]
-Solution: [%X = 6]
-Solution: [%X = 7]
-Solution: [%X = 8]
-
-... with all optimizations:
 Solution: [%X = 1]
 Solution: [%X = 2]
 Solution: [%X = 3]
@@ -46,12 +35,6 @@ All:
         %Y <- 1
 
 
-... without optimizations:
-Solution: [%X = 1, %Y = 1]
-Solution: [%X = 2, %Y = 2]
-Solution: [%X = 3, %Y = 3]
-
-... with all optimizations:
 Solution: [%X = 1, %Y = 1]
 Solution: [%X = 2, %Y = 2]
 Solution: [%X = 3, %Y = 3]
diff --git a/testsuite/tests/adalog/domain_or/test.out b/testsuite/tests/adalog/domain_or/test.out
index 03c85e96a..6883a01bb 100644
--- a/testsuite/tests/adalog/domain_or/test.out
+++ b/testsuite/tests/adalog/domain_or/test.out
@@ -7,15 +7,6 @@ Any:
     %X <- 5
     %X <- 6
 
-... without optimizations:
-Solution: [%X = 1]
-Solution: [%X = 2]
-Solution: [%X = 3]
-Solution: [%X = 4]
-Solution: [%X = 5]
-Solution: [%X = 6]
-
-... with all optimizations:
 Solution: [%X = 1]
 Solution: [%X = 2]
 Solution: [%X = 3]
diff --git a/testsuite/tests/adalog/dyn_scheduling/test.out b/testsuite/tests/adalog/dyn_scheduling/test.out
index f00b7103c..27ef8ab3b 100644
--- a/testsuite/tests/adalog/dyn_scheduling/test.out
+++ b/testsuite/tests/adalog/dyn_scheduling/test.out
@@ -9,12 +9,6 @@ All:
         %X <- 3
 
 
-... without optimizations:
-Solution: [%X = 1, %Y = 1]
-Solution: [%X = 2, %Y = 2]
-Solution: [%X = 3, %Y = 3]
-
-... with all optimizations:
 Solution: [%X = 1, %Y = 1]
 Solution: [%X = 2, %Y = 2]
 Solution: [%X = 3, %Y = 3]
@@ -40,12 +34,6 @@ All:
         %Y <- 10
 
 
-... without optimizations:
-Solution: [%X = 1, %Y = 10]
-Solution: [%X = 2, %Y = 10]
-Solution: [%X = 3, %Y = 10]
-
-... with all optimizations:
 Solution: [%X = 1, %Y = 10]
 Solution: [%X = 2, %Y = 10]
 Solution: [%X = 3, %Y = 10]
@@ -61,9 +49,6 @@ All:
         %X <- 3
 
 
-... without optimizations:
-
-... with all optimizations:
 
 ========================================================================
 
@@ -72,9 +57,6 @@ All:
     Is_Even?(%Y)
     Is_Even?(%X)
 
-... without optimizations:
-
-... with all optimizations:
 
 ========================================================================
 
@@ -84,11 +66,6 @@ Any:
     %X <- 1
     %X <- 2
 
-... without optimizations:
-Solution: [%Y = <undefined>, %X = 1]
-Solution: [%Y = <undefined>, %X = 2]
-
-... with all optimizations:
 Solution: [%Y = <undefined>, %X = 1]
 Solution: [%Y = <undefined>, %X = 2]
 
@@ -99,9 +76,6 @@ Any:
     Is_Even?(%X)
     Is_Even?(%Y)
 
-... without optimizations:
-
-... with all optimizations:
 
 ========================================================================
 
@@ -117,9 +91,6 @@ Any:
         Is_Even?(%Y)
 
 
-... without optimizations:
-
-... with all optimizations:
 
 ========================================================================
 
@@ -136,10 +107,6 @@ All:
 
     %X <-> %Y
 
-... without optimizations:
-Solution: [%X = 2, %Y = 2]
-
-... with all optimizations:
 Solution: [%X = 2, %Y = 2]
 
 Done.
diff --git a/testsuite/tests/adalog/exception_in_partial_solution/test.out b/testsuite/tests/adalog/exception_in_partial_solution/test.out
index 7304a205f..5c858b9c5 100644
--- a/testsuite/tests/adalog/exception_in_partial_solution/test.out
+++ b/testsuite/tests/adalog/exception_in_partial_solution/test.out
@@ -163,8 +163,5 @@ All:
     Is_Even?(%X3)
     Is_Even?(%X6)
 
-... without optimizations:
-
-... with all optimizations:
 
 Done.
diff --git a/testsuite/tests/adalog/false_atom/test.out b/testsuite/tests/adalog/false_atom/test.out
index 90d848cf1..e471fef37 100644
--- a/testsuite/tests/adalog/false_atom/test.out
+++ b/testsuite/tests/adalog/false_atom/test.out
@@ -1,7 +1,4 @@
 Solving relation:
 False
-... without optimizations:
-
-... with all optimizations:
 
 Done.
diff --git a/testsuite/tests/adalog/general/test.out b/testsuite/tests/adalog/general/test.out
index b270f8350..0ee74951d 100644
--- a/testsuite/tests/adalog/general/test.out
+++ b/testsuite/tests/adalog/general/test.out
@@ -15,11 +15,6 @@ All:
         %Y <- 18
 
 
-... without optimizations:
-Solution: [%X = 4, %Y = 12]
-Solution: [%X = 6, %Y = 18]
-
-... with all optimizations:
 Solution: [%X = 4, %Y = 12]
 Solution: [%X = 6, %Y = 18]
 
diff --git a/testsuite/tests/adalog/image/test.out b/testsuite/tests/adalog/image/test.out
index 35db4902b..62f961e04 100644
--- a/testsuite/tests/adalog/image/test.out
+++ b/testsuite/tests/adalog/image/test.out
@@ -19,18 +19,6 @@ All:
 
     True
 
-... without optimizations:
-Solution: [%X = 1, %Y = 1]
-Solution: [%X = 2, %Y = 2]
-Solution: [%X = 3, %Y = 3]
-Solution: [%X = 4, %Y = 4]
-Solution: [%X = 5, %Y = 5]
-Solution: [%X = 6, %Y = 6]
-Solution: [%X = 10, %Y = 10]
-Solution: [%X = 11, %Y = 11]
-Solution: [%X = <undefined>, %Y = <undefined>]
-
-... with all optimizations:
 Solution: [%X = 1, %Y = 1]
 Solution: [%X = 2, %Y = 2]
 Solution: [%X = 3, %Y = 3]
diff --git a/testsuite/tests/adalog/incomplete_branch/test.out b/testsuite/tests/adalog/incomplete_branch/test.out
index e77032e0b..5ed563b99 100644
--- a/testsuite/tests/adalog/incomplete_branch/test.out
+++ b/testsuite/tests/adalog/incomplete_branch/test.out
@@ -6,10 +6,6 @@ Any:
         %Y <- 1
 
 
-... without optimizations:
-Solution: [%X = 1, %Y = <undefined>]
-
-... with all optimizations:
 Solution: [%X = 1, %Y = <undefined>]
 
 Done.
diff --git a/testsuite/tests/adalog/indirect_aliasing/test.out b/testsuite/tests/adalog/indirect_aliasing/test.out
index 5e7730ecb..d5317f19d 100644
--- a/testsuite/tests/adalog/indirect_aliasing/test.out
+++ b/testsuite/tests/adalog/indirect_aliasing/test.out
@@ -6,8 +6,5 @@ All:
     %Expr <- 1
     %X <-> %Expr
 
-... without optimizations:
-
-... with all optimizations:
 
 Done.
diff --git a/testsuite/tests/adalog/invalid_atom/test.out b/testsuite/tests/adalog/invalid_atom/test.out
index b9a5b9ec5..37ae7fc22 100644
--- a/testsuite/tests/adalog/invalid_atom/test.out
+++ b/testsuite/tests/adalog/invalid_atom/test.out
@@ -1,7 +1,4 @@
 Solving relation:
 Is_Even?(%X)
-... without optimizations:
-
-... with all optimizations:
 
 Done.
diff --git a/testsuite/tests/adalog/multiway_aliasing/test.out b/testsuite/tests/adalog/multiway_aliasing/test.out
index 846e07d79..08d5642ef 100644
--- a/testsuite/tests/adalog/multiway_aliasing/test.out
+++ b/testsuite/tests/adalog/multiway_aliasing/test.out
@@ -9,10 +9,6 @@ All:
     %D <-> %X
     %X <- 1
 
-... without optimizations:
-Solution: [%X = 1, %Y = 1, %Z = 1, %A = 1, %E = 1, %B = 1, %C = 1, %D = 1]
-
-... with all optimizations:
 Solution: [%X = 1, %Y = 1, %Z = 1, %A = 1, %E = 1, %B = 1, %C = 1, %D = 1]
 
 Done.
diff --git a/testsuite/tests/adalog/n_predicate/test.out b/testsuite/tests/adalog/n_predicate/test.out
index aeccae42a..65c17ead5 100644
--- a/testsuite/tests/adalog/n_predicate/test.out
+++ b/testsuite/tests/adalog/n_predicate/test.out
@@ -18,12 +18,6 @@ All:
         %Y <- 6
 
 
-... without optimizations:
-Solution: [%X = 2, %Y = 1]
-Solution: [%X = 4, %Y = 2]
-Solution: [%X = 6, %Y = 3]
-
-... with all optimizations:
 Solution: [%X = 2, %Y = 1]
 Solution: [%X = 4, %Y = 2]
 Solution: [%X = 6, %Y = 3]
diff --git a/testsuite/tests/adalog/n_predicate_2/test.out b/testsuite/tests/adalog/n_predicate_2/test.out
index c01b5269a..e31fca54e 100644
--- a/testsuite/tests/adalog/n_predicate_2/test.out
+++ b/testsuite/tests/adalog/n_predicate_2/test.out
@@ -4,10 +4,6 @@ All:
     %Y <- 1
     Is_Double_Of?(%X, %Y)
 
-... without optimizations:
-Solution: [%X = 2, %Y = 1]
-
-... with all optimizations:
 Solution: [%X = 2, %Y = 1]
 
 Done.
diff --git a/testsuite/tests/adalog/n_propagate/test.out b/testsuite/tests/adalog/n_propagate/test.out
index 6380b862e..f498f0137 100644
--- a/testsuite/tests/adalog/n_propagate/test.out
+++ b/testsuite/tests/adalog/n_propagate/test.out
@@ -4,10 +4,6 @@ All:
     %X <- 1
     %Y <- 2
 
-... without optimizations:
-Solution: [%Z = 3, %X = 1, %Y = 2]
-
-... with all optimizations:
 Solution: [%Z = 3, %X = 1, %Y = 2]
 
 Solving relation:
@@ -17,10 +13,6 @@ All:
     %Z <- 1
     %X <- 0
 
-... without optimizations:
-Solution: [%Z = 1, %Y = 1, %X = 0]
-
-... with all optimizations:
 Solution: [%Z = 1, %Y = 1, %X = 0]
 
 Done.
diff --git a/testsuite/tests/adalog/pred_before_set/test.out b/testsuite/tests/adalog/pred_before_set/test.out
index 30bdbe073..90424668b 100644
--- a/testsuite/tests/adalog/pred_before_set/test.out
+++ b/testsuite/tests/adalog/pred_before_set/test.out
@@ -9,10 +9,6 @@ All:
 
     %X <- 2
 
-... without optimizations:
-Solution: [%Y = 1, %X = 2]
-
-... with all optimizations:
 Solution: [%Y = 1, %X = 2]
 
 Done.
diff --git a/testsuite/tests/adalog/pred_exc/test.out b/testsuite/tests/adalog/pred_exc/test.out
index 96190d4f8..822323909 100644
--- a/testsuite/tests/adalog/pred_exc/test.out
+++ b/testsuite/tests/adalog/pred_exc/test.out
@@ -6,10 +6,6 @@ All:
         Predicate?(%X)
 
 
-... without optimizations:
-  -> MAIN.MY_ERROR: main.adb:15
-
-... with all optimizations:
   -> MAIN.MY_ERROR: main.adb:15
 
 Done.
diff --git a/testsuite/tests/adalog/pred_order/test.out b/testsuite/tests/adalog/pred_order/test.out
index 07c0572fa..12f1fee23 100644
--- a/testsuite/tests/adalog/pred_order/test.out
+++ b/testsuite/tests/adalog/pred_order/test.out
@@ -9,11 +9,6 @@ All:
     is_positive?(%X)
     lt-100?(%X)
 
-... without optimizations:
-Solution: [%X = 27]
-Solution: [%X = 100]
-
-... with all optimizations:
 Solution: [%X = 27]
 Solution: [%X = 100]
 
diff --git a/testsuite/tests/adalog/self_alias/test.out b/testsuite/tests/adalog/self_alias/test.out
index 358010c15..95d32687f 100644
--- a/testsuite/tests/adalog/self_alias/test.out
+++ b/testsuite/tests/adalog/self_alias/test.out
@@ -4,10 +4,6 @@ All:
     %X <- 1
     %Y <- 1
 
-... without optimizations:
-Solution: [%X = 1, %Y = 1]
-
-... with all optimizations:
 Solution: [%X = 1, %Y = 1]
 
 Done.
diff --git a/testsuite/tests/adalog/stateless_wrappers/test.out b/testsuite/tests/adalog/stateless_wrappers/test.out
index ab82b2546..fb34341e0 100644
--- a/testsuite/tests/adalog/stateless_wrappers/test.out
+++ b/testsuite/tests/adalog/stateless_wrappers/test.out
@@ -11,12 +11,6 @@ All:
     %y <- double(%x)
     is_odd?(%x)
 
-... without optimizations:
-Solution: [%x = 1, %y = 2]
-Solution: [%x = 3, %y = 6]
-Solution: [%x = 5, %y = 10]
-
-... with all optimizations:
 Solution: [%x = 1, %y = 2]
 Solution: [%x = 3, %y = 6]
 Solution: [%x = 5, %y = 10]
diff --git a/testsuite/tests/adalog/timeout/test.out b/testsuite/tests/adalog/timeout/test.out
index 44e51f3bc..0af8b1ad8 100644
--- a/testsuite/tests/adalog/timeout/test.out
+++ b/testsuite/tests/adalog/timeout/test.out
@@ -255,11 +255,6 @@ All:
         %X9 <- 30 A9
 
 
-... without optimizations:
-Solution: [%X1 = 10, %X2 = 11, %X3 = 20, %X4 = 17, %X5 = 18, %X6 = 19, %X7 = 20, %X8 = 21, %X9 = 22]
-Resolution failed with Timeout_Error
-
-... with all optimizations:
 Solution: [%X1 = 10, %X2 = 11, %X3 = 20, %X4 = 17, %X5 = 18, %X6 = 19, %X7 = 20, %X8 = 21, %X9 = 22]
 Resolution failed with Timeout_Error
 
@@ -332,23 +327,6 @@ All:
     Is_Even?(%X1)
     Is_Next?(%X1, %X2)
 
-... without optimizations:
-Solution: [%X1 = 2, %X2 = 3]
-Solution: [%X1 = 4, %X2 = 5]
-Solution: [%X1 = 6, %X2 = 7]
-Solution: [%X1 = 8, %X2 = 9]
-Solution: [%X1 = 10, %X2 = 11]
-Solution: [%X1 = 12, %X2 = 13]
-Solution: [%X1 = 14, %X2 = 15]
-Solution: [%X1 = 16, %X2 = 17]
-Solution: [%X1 = 18, %X2 = 19]
-Solution: [%X1 = 20, %X2 = 21]
-Solution: [%X1 = 22, %X2 = 23]
-Solution: [%X1 = 24, %X2 = 25]
-Solution: [%X1 = 26, %X2 = 27]
-Solution: [%X1 = 28, %X2 = 29]
-
-... with all optimizations:
 Solution: [%X1 = 2, %X2 = 3]
 Solution: [%X1 = 4, %X2 = 5]
 Solution: [%X1 = 6, %X2 = 7]
diff --git a/testsuite/tests/adalog/topo_sort_cleanup/test.out b/testsuite/tests/adalog/topo_sort_cleanup/test.out
index 379320b08..b50f2939a 100644
--- a/testsuite/tests/adalog/topo_sort_cleanup/test.out
+++ b/testsuite/tests/adalog/topo_sort_cleanup/test.out
@@ -10,7 +10,6 @@ Any:
         %X <- 3
 
 
-... with all optimizations:
 Solution: [%X = 3, %Y = 2]
 
 Done.
diff --git a/testsuite/tests/adalog/true_pred/test.out b/testsuite/tests/adalog/true_pred/test.out
index 875ff9200..ab414a9a4 100644
--- a/testsuite/tests/adalog/true_pred/test.out
+++ b/testsuite/tests/adalog/true_pred/test.out
@@ -10,15 +10,6 @@ All:
 
     True
 
-... without optimizations:
-Solution: [%X = 1]
-Solution: [%X = 2]
-Solution: [%X = 3]
-Solution: [%X = 4]
-Solution: [%X = 5]
-Solution: [%X = 6]
-
-... with all optimizations:
 Solution: [%X = 1]
 Solution: [%X = 2]
 Solution: [%X = 3]
diff --git a/testsuite/tests/adalog/unify_in_any/test.out b/testsuite/tests/adalog/unify_in_any/test.out
index fe3d05b84..a88729289 100644
--- a/testsuite/tests/adalog/unify_in_any/test.out
+++ b/testsuite/tests/adalog/unify_in_any/test.out
@@ -16,15 +16,6 @@ All:
 
     N_Predicate?(%X, %Y)
 
-... without optimizations:
-Solution: [%X = 1, %Y = 1]
-Solution: [%X = 2, %Y = 2]
-Solution: [%X = -1, %Y = -1]
-Solution: [%X = -2, %Y = -2]
-Solution: [%X = 1, %Y = -1]
-Solution: [%X = 2, %Y = -2]
-
-... with all optimizations:
 Solution: [%X = 1, %Y = 1]
 Solution: [%X = 2, %Y = 2]
 Solution: [%X = -1, %Y = -1]
diff --git a/testsuite/tests/adalog/unify_lr/test.out b/testsuite/tests/adalog/unify_lr/test.out
index affe9bb28..3df159f4e 100644
--- a/testsuite/tests/adalog/unify_lr/test.out
+++ b/testsuite/tests/adalog/unify_lr/test.out
@@ -12,10 +12,6 @@ All:
 
     %X <-> %Y
 
-... without optimizations:
-Solution: [%X = 2, %Y = 2]
-
-... with all optimizations:
 Solution: [%X = 2, %Y = 2]
 
 ========================================================================
@@ -28,11 +24,6 @@ All:
 
     %X <-> %Y
 
-... without optimizations:
-Solution: [%X = 1, %Y = 1]
-Solution: [%X = 2, %Y = 2]
-
-... with all optimizations:
 Solution: [%X = 1, %Y = 1]
 Solution: [%X = 2, %Y = 2]
 
@@ -46,11 +37,6 @@ All:
 
     %Y <-> %X
 
-... without optimizations:
-Solution: [%X = 1, %Y = 1]
-Solution: [%X = 2, %Y = 2]
-
-... with all optimizations:
 Solution: [%X = 1, %Y = 1]
 Solution: [%X = 2, %Y = 2]
 
@@ -65,10 +51,6 @@ All:
     Is_Even?(%Y)
     %X <-> %Y
 
-... without optimizations:
-Solution: [%X = 2, %Y = 2]
-
-... with all optimizations:
 Solution: [%X = 2, %Y = 2]
 
 ========================================================================
@@ -82,10 +64,6 @@ All:
     Is_Even?(%X)
     %X <-> %Y
 
-... without optimizations:
-Solution: [%Y = 2, %X = 2]
-
-... with all optimizations:
 Solution: [%Y = 2, %X = 2]
 
 Done.
diff --git a/testsuite/tests/adalog/unify_one_side/test.out b/testsuite/tests/adalog/unify_one_side/test.out
index 710deee27..76437230b 100644
--- a/testsuite/tests/adalog/unify_one_side/test.out
+++ b/testsuite/tests/adalog/unify_one_side/test.out
@@ -13,10 +13,6 @@ All:
     %X <- Square(3)
     %Y <- Square(4)
 
-... without optimizations:
-Solution: [%X = 9, %Y = 16]
-
-... with all optimizations:
 Solution: [%X = 9, %Y = 16]
 
 ========================================================================
@@ -29,11 +25,6 @@ All:
 
     %X <- Square(4)
 
-... without optimizations:
-Solution: [%Y = 2, %X = 16]
-Solution: [%Y = 3, %X = 16]
-
-... with all optimizations:
 Solution: [%Y = 2, %X = 16]
 Solution: [%Y = 3, %X = 16]
 
@@ -45,9 +36,6 @@ All:
     %X <- Square(3)
     %Y <- Square(%X)
 
-... without optimizations:
-
-... with all optimizations:
 
 ========================================================================
 
@@ -65,17 +53,6 @@ All:
 
     %Y <- Square(%X)
 
-... without optimizations:
-Solution: [%X = 1, %Y = 1]
-Solution: [%X = 2, %Y = 4]
-Solution: [%X = 3, %Y = 9]
-Solution: [%X = 4, %Y = 16]
-Solution: [%X = 5, %Y = 25]
-Solution: [%X = 6, %Y = 36]
-Solution: [%X = 7, %Y = 49]
-Solution: [%X = 8, %Y = 64]
-
-... with all optimizations:
 Solution: [%X = 1, %Y = 1]
 Solution: [%X = 2, %Y = 4]
 Solution: [%X = 3, %Y = 9]
diff --git a/testsuite/tests/adalog/unify_reset/test.out b/testsuite/tests/adalog/unify_reset/test.out
index 440799292..a01d1a5a8 100644
--- a/testsuite/tests/adalog/unify_reset/test.out
+++ b/testsuite/tests/adalog/unify_reset/test.out
@@ -10,11 +10,6 @@ Any:
         %Y <- 12
 
 
-... without optimizations:
-Solution: [%X = 1, %Y = 1]
-Solution: [%X = 3, %Y = 12]
-
-... with all optimizations:
 Solution: [%X = 1, %Y = 1]
 Solution: [%X = 3, %Y = 12]
 
diff --git a/testsuite/tests/adalog/var_aliasing_chain_cleanup/test.out b/testsuite/tests/adalog/var_aliasing_chain_cleanup/test.out
index cf6a8eea1..640f86545 100644
--- a/testsuite/tests/adalog/var_aliasing_chain_cleanup/test.out
+++ b/testsuite/tests/adalog/var_aliasing_chain_cleanup/test.out
@@ -12,11 +12,6 @@ All:
 
 
 
-... without optimizations:
-Solution: [%X = 1, %Y = 1, %Z = 1]
-Solution: [%X = 10, %Y = 10, %Z = 11]
-
-... with all optimizations:
 Solution: [%X = 1, %Y = 1, %Z = 1]
 Solution: [%X = 10, %Y = 10, %Z = 11]
 
diff --git a/testsuite/tests/adalog/var_aliasing_cleanup/test.out b/testsuite/tests/adalog/var_aliasing_cleanup/test.out
index fe66be6a0..0f40b528f 100644
--- a/testsuite/tests/adalog/var_aliasing_cleanup/test.out
+++ b/testsuite/tests/adalog/var_aliasing_cleanup/test.out
@@ -23,11 +23,6 @@ All:
         %Y <- 19
 
 
-... without optimizations:
-Solution: [%X = 12, %Y = 15]
-Solution: [%X = 18, %Y = 18]
-
-... with all optimizations:
 Solution: [%X = 12, %Y = 15]
 Solution: [%X = 18, %Y = 18]
 
diff --git a/testsuite/tests/adalog/variadics/test.out b/testsuite/tests/adalog/variadics/test.out
index b270f8350..0ee74951d 100644
--- a/testsuite/tests/adalog/variadics/test.out
+++ b/testsuite/tests/adalog/variadics/test.out
@@ -15,11 +15,6 @@ All:
         %Y <- 18
 
 
-... without optimizations:
-Solution: [%X = 4, %Y = 12]
-Solution: [%X = 6, %Y = 18]
-
-... with all optimizations:
 Solution: [%X = 4, %Y = 12]
 Solution: [%X = 6, %Y = 18]
 
diff --git a/testsuite/tests/adalog/variant_eq_conv/test.out b/testsuite/tests/adalog/variant_eq_conv/test.out
index a45634e78..1d8d4fd1b 100644
--- a/testsuite/tests/adalog/variant_eq_conv/test.out
+++ b/testsuite/tests/adalog/variant_eq_conv/test.out
@@ -16,11 +16,6 @@ All:
     %y <- to_str(%x)
     is_odd?(%x)
 
-... without optimizations:
-Solution: [%x = 1, %y = one]
-Solution: [%x = 5, %y = five]
-
-... with all optimizations:
 Solution: [%x = 1, %y = one]
 Solution: [%x = 5, %y = five]