diff --git a/ada/buildsupport.adb b/ada/buildsupport.adb
index cfe8cdfe1c974ae05d3dd33f8ae3a18e1a1b0d53..63b52b24758cc5f30b14ee57afe90dbcae2b169d 100644
--- a/ada/buildsupport.adb
+++ b/ada/buildsupport.adb
@@ -729,9 +729,11 @@ procedure BuildSupport is
                         Bus_Classifier : Name_Id := No_Name;
                         Pkg_Name : Name_Id := No_Name;
                      begin
+                        --  Iterate on the BUS Instance properties
                         for each in Properties.Iterate loop
-                           Put_Line (Property_Maps.Key (each) & " : " &
-                                     Property_Maps.Element (each));
+                           null;
+                           --  Put_Line (Property_Maps.Key (each) & " : " &
+                           --            Property_Maps.Element (each));
                         end loop;
                         Set_Str_To_Name_Buffer ("");
                         if ATN.Namespace
diff --git a/ada/buildsupport_utils.adb b/ada/buildsupport_utils.adb
index 7abf764c994946a56cd7dbf7ca09d93abe35f52b..dd376bb8daea27b6bd59535a09d400718b08e7d8 100644
--- a/ada/buildsupport_utils.adb
+++ b/ada/buildsupport_utils.adb
@@ -262,16 +262,10 @@ package body Buildsupport_Utils is
       single_val : Node_Id;
    begin
       while Present (property) loop
-         --  pragma Assert (AIN.Kind (property) =
-         --               AIN.K_Property_Association_Instance);
          prop_value := AIN.Property_Association_Value (property);
-         --  prop_value is is of ATN.Kind K_Property_Value
-         --  Put (Get_Name_String (Display_Name (Identifier (property))));
-         --  Put_Line (" of kind " & AIN.Kind (property)'Img);
          if Present (ATN.Single_Value (prop_value)) then
             --  Only support single-value properties for now
             single_val := ATN.Single_Value (prop_value);
-            Put_Line (ATN.Kind (single_val)'Img); -- e.g. K_Literal!
             result.Insert (Key => Get_Name_String
                                       (Display_Name (Identifier (property))),
                         New_Item =>