diff --git a/Bender.yml b/Bender.yml
index 208387e8bc0241932baae2b61543032df4c8a52d..4050071580768850a86784e1e58f8c556ba98cbb 100644
--- a/Bender.yml
+++ b/Bender.yml
@@ -60,21 +60,15 @@ sources:
     - src/mult.sv
     - src/load_unit.sv
     - src/issue_read_operands.sv
-    - src/fpu/src/fpnew_f2icast.sv
     - src/fpu/src/fpnew_fma.sv
     - src/fpu/src/fpnew_opgroup_fmt_slice.sv
     - src/fpu/src/fpnew_divsqrt_multi.sv
-    - src/fpu/src/fpnew_f2fcast.sv
     - src/fpu/src/fpnew_fma_multi.sv
-    - src/fpu/src/fpnew_pipe_out.sv
     - src/fpu/src/fpnew_opgroup_multifmt_slice.sv
     - src/fpu/src/fpnew_classifier.sv
     - src/fpu/src/fpnew_noncomp.sv
     - src/fpu/src/fpnew_cast_multi.sv
     - src/fpu/src/fpnew_opgroup_block.sv
-    - src/fpu/src/fpnew_i2fcast.sv
-    - src/fpu/src/fpnew_pipe_in.sv
-    - src/fpu/src/fpnew_pipe_fma_inside.sv
     - src/fpu/src/fpnew_rounding.sv
     - src/fpu/src/fpnew_top.sv
     - src/fpu/src/fpu_div_sqrt_mvp/hdl/iteration_div_sqrt_mvp.sv
diff --git a/Flist.ariane b/Flist.ariane
index ed30e8dfcd9243c1c5ff4ff0b87e2d2baa22cb6f..a786ce411ee9eaa50dbb4e20c073f06f3c6d02f9 100644
--- a/Flist.ariane
+++ b/Flist.ariane
@@ -46,19 +46,12 @@ src/fpu/src/fpu_div_sqrt_mvp/hdl/preprocess_mvp.sv
 src/fpu/src/fpnew_cast_multi.sv
 src/fpu/src/fpnew_classifier.sv
 src/fpu/src/fpnew_divsqrt_multi.sv
-src/fpu/src/fpnew_f2fcast.sv
-src/fpu/src/fpnew_f2icast.sv
 src/fpu/src/fpnew_fma_multi.sv
 src/fpu/src/fpnew_fma.sv
-src/fpu/src/fpnew_i2fcast.sv
 src/fpu/src/fpnew_noncomp.sv
 src/fpu/src/fpnew_opgroup_block.sv
 src/fpu/src/fpnew_opgroup_fmt_slice.sv
 src/fpu/src/fpnew_opgroup_multifmt_slice.sv
-src/fpu/src/fpnew_pipe_in.sv
-src/fpu/src/fpnew_pipe_out.sv
-src/fpu/src/fpnew_pipe_inside_fma.sv
-src/fpu/src/fpnew_pipe_inside_cast.sv
 src/fpu/src/fpnew_rounding.sv
 src/fpu/src/fpnew_top.sv
 src/axi/src/axi_pkg.sv
diff --git a/Makefile b/Makefile
index f63a7f0fc88de4585f620c4f889f1c1980aa4181..01bc3d9f60e0435a07a07faa955c14286e6fa75b 100644
--- a/Makefile
+++ b/Makefile
@@ -361,6 +361,7 @@ verilate_command := $(verilator)
                     -Wno-DECLFILENAME                                                                            \
                     -Wno-UNUSED                                                                                  \
                     -Wno-UNOPTFLAT                                                                               \
+                    -Wno-BLKANDNBLK                                                                              \
                     -Wno-style                                                                                   \
                     $(if $(PROFILE),--stats --stats-vars --profile-cfuncs,)                                      \
                     $(if $(DEBUG),--trace --trace-structs,)                                                      \
diff --git a/src/fpu b/src/fpu
index 120f7f5184fa392d9a1ac1b4952de95eb6baa41a..4a241d48e7e16ebd146423769828fdcd7e90de61 160000
--- a/src/fpu
+++ b/src/fpu
@@ -1 +1 @@
-Subproject commit 120f7f5184fa392d9a1ac1b4952de95eb6baa41a
+Subproject commit 4a241d48e7e16ebd146423769828fdcd7e90de61