diff --git a/Bender.yml b/Bender.yml
index caf11f2a5..6a15fcb64 100644
--- a/Bender.yml
+++ b/Bender.yml
@@ -15,8 +15,6 @@ sources:
       WT_DCACHE: 1
     files:
     # Packages
-    # - core/include/cv32a6_imac_sv0_config_pkg.sv # new? (required for cva6_config_pkg)
-    - core/include/cv64a6_imacfd_sv39_config_pkg.sv # new? (required for cva6_config_pkg)
     - core/include/riscv_pkg.sv
     - corev_apu/riscv-dbg/src/dm_pkg.sv
     - core/include/ariane_pkg.sv
@@ -26,8 +24,8 @@ sources:
     - corev_apu/register_interface/src/reg_intf.sv
     - corev_apu/register_interface/src/reg_intf_pkg.sv
     - core/include/axi_intf.sv
-    - corev_apu/tb/ariane_soc_pkg.sv # new?
-    - corev_apu/tb/ariane_axi_soc_pkg.sv # new?
+    - corev_apu/tb/ariane_soc_pkg.sv
+    - corev_apu/tb/ariane_axi_soc_pkg.sv
     - core/include/ariane_axi_pkg.sv
     - core/fpu/src/fpnew_pkg.sv
     - core/fpu/src/fpu_div_sqrt_mvp/hdl/defs_div_sqrt_mvp.sv
@@ -44,8 +42,8 @@ sources:
     - core/issue_stage.sv
     - core/re_name.sv
     - core/csr_buffer.sv
-    - core/mmu_sv32/cva6_tlb_sv32.sv # added, 32bit ?
-    - core/mmu_sv39/tlb.sv # added, 64bit ?
+    - core/mmu_sv32/cva6_tlb_sv32.sv
+    - core/mmu_sv39/tlb.sv
     - core/decoder.sv
     - core/scoreboard.sv
     - core/perf_counters.sv
@@ -62,16 +60,13 @@ sources:
     - core/ex_stage.sv
     - core/mmu_sv39/mmu.sv
     - core/mmu_sv39/ptw.sv
-    # - core/mmu_sv39/mult.sv deleted?
-    - core/mult.sv # above & cva6_mult_sv32.sv replaced with this?
+    - core/mult.sv
     - core/mmu_sv32/cva6_mmu_sv32.sv
     - core/mmu_sv32/cva6_ptw_sv32.sv
-    # - core/mmu_sv32/cva6_mult_sv32.sv deleted?
     - core/load_unit.sv
     - core/issue_read_operands.sv
     - core/pmp/src/pmp_entry.sv
     - core/pmp/src/pmp.sv
-    # - src/synopsys_sram.sv deleted?
     - core/fpu/src/fpnew_fma.sv
     - core/fpu/src/fpnew_opgroup_fmt_slice.sv
     - core/fpu/src/fpnew_divsqrt_multi.sv
@@ -184,7 +179,7 @@ sources:
     - corev_apu/axi/src/axi_delayer.sv
     - corev_apu/axi/src/axi_to_axi_lite.sv
     - corev_apu/fpga-support/rtl/SyncSpRamBeNx64.sv
-    - common/submodules/common_cells/src/sync.sv # missing?
+    - common/submodules/common_cells/src/sync.sv
     - common/submodules/common_cells/src/popcount.sv
     - common/submodules/common_cells/src/unread.sv
     - common/submodules/common_cells/src/cdc_2phase.sv
@@ -205,6 +200,12 @@ sources:
     - common/submodules/common_cells/src/exp_backoff.sv
     - corev_apu/src/tech_cells_generic/src/cluster_clock_inverter.sv
     - corev_apu/src/tech_cells_generic/src/pulp_clock_mux2.sv
+    - target: not(cv32a6)
+      files:
+      - core/include/cv64a6_imacfd_sv39_config_pkg.sv
+    - target: cv32a6
+      files:
+      - core/include/cv32a6_imac_sv0_config_pkg.sv
     - target: test
       files:
       - corev_apu/tb/ariane_soc_pkg.sv
@@ -219,11 +220,10 @@ sources:
       - common/local/util/sram.sv
     - target: not(synthesis)
       files:
-        - common/local/util/instr_tracer.sv # before: instruction_tracer.sv ?
-        - common/local/util/instr_tracer_if.sv # before: instruction_tracer_if.sv ?
-        # - common/local/util/instruction_tracer_defines.svh # removed?
-        - common/local/util/instr_trace_item.svh # before: instruction_trace_item.svh ?
-        - common/local/util/ex_trace_item.svh # before: exception_trace_item.svh ?
+        - common/local/util/instr_tracer.sv
+        - common/local/util/instr_tracer_if.sv
+        - common/local/util/instr_trace_item.svh
+        - common/local/util/ex_trace_item.svh
     - target: all(fpga, xilinx)
       files:
       - corev_apu/fpga/src/ariane_peripherals_xilinx.sv
@@ -257,3 +257,4 @@ sources:
       - corev_apu/fpga/src/apb_uart/src/slib_clock_div.vhd
       - corev_apu/fpga/src/apb_uart/src/slib_fifo.vhd
       - corev_apu/fpga/src/apb_uart/src/uart_baudgen.vhd
+