diff --git a/SoCMakeConfig.cmake b/SoCMakeConfig.cmake
index 2dc5fe4..57f1ddd 100644
--- a/SoCMakeConfig.cmake
+++ b/SoCMakeConfig.cmake
@@ -56,7 +56,6 @@ include("${CMAKE_CURRENT_LIST_DIR}/cmake/sim/cocotb/add_cocotb_iverilog_tests.cm
 # ====================================
 
 include("${CMAKE_CURRENT_LIST_DIR}/cmake/peakrdl/peakrdl_regblock.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/cmake/peakrdl/peakrdl_regblock_wrap.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/cmake/peakrdl/peakrdl_halcpp.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/cmake/peakrdl/peakrdl_ipblocksvg.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/cmake/peakrdl/peakrdl_html/peakrdl_html.cmake")
diff --git a/cmake/peakrdl/peakrdl_regblock_wrap.cmake b/cmake/peakrdl/peakrdl_regblock_wrap.cmake
deleted file mode 100644
index 9fe223a..0000000
--- a/cmake/peakrdl/peakrdl_regblock_wrap.cmake
+++ /dev/null
@@ -1,132 +0,0 @@
-function(peakrdl_regblock_wrap IP_LIB)
-    # Parse keyword arguments
-    cmake_parse_arguments(ARG "TMR" "OUTDIR;RENAME;INTF;RESET;OUT_LIST" "" ${ARGN})
-    # Check for any unknown argument
-    if(ARG_UNPARSED_ARGUMENTS)
-        message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} passed unrecognized argument "
-                "${ARG_UNPARSED_ARGUMENTS}")
-    endif()
-
-    include("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/../hwip.cmake")
-    include("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/../utils/find_python.cmake")
-
-    alias_dereference(IP_LIB ${IP_LIB})
-    get_target_property(BINARY_DIR ${IP_LIB} BINARY_DIR)
-
-    # Default output directory is regblock/
-    if(NOT ARG_OUTDIR)
-        if(NOT ARG_TMR)
-            set(OUTDIR ${BINARY_DIR}/regblock)
-        else()
-            set(OUTDIR ${BINARY_DIR}/regblock_tmr)
-        endif()
-    else()
-        set(OUTDIR ${ARG_OUTDIR})
-    endif()
-
-    if(NOT ARG_RENAME)
-        # The default name is the IP name
-        get_target_property(IP_NAME ${IP_LIB} IP_NAME)
-    else()
-        set(IP_NAME ${ARG_RENAME})
-    endif()
-
-    # The default interface used is apb3, set another on if the argument exists
-    if(ARG_INTF)
-        set(INTF_ARG --cpuif ${ARG_INTF})
-    endif()
-
-    # The default reset is active-high and synchronous
-    if(ARG_RESET)
-        set(RESET_ARG --default-reset ${ARG_RESET})
-    endif()
-
-    # Activate the triplication if TMR option is passed
-    if(ARG_TMR)
-        set(TMR_OPT "--tmr")
-    endif()
-
-    if(NOT ARG_RENAME)
-        # The default name is the IP name
-        get_target_property(REGBLOCK_NAME ${IP_LIB} IP_NAME)
-        if(NOT REGBLOCK_NAME)
-            message(FATAL_ERROR "IP_NAME not set for ${IP_LIB}, check if the IP was added with
-                    add_ip function from SoCMake")
-        endif()
-        set(REGBLOCK_NAME ${REGBLOCK_NAME}_regblock)
-    else()
-        set(REGBLOCK_NAME ${ARG_RENAME})
-    endif()
-
-    # Get the SystemRDL sources to generate the register block
-    # This function gets the IP sources and the deps
-    get_ip_sources(RDL_SOURCES ${IP_LIB} SYSTEMRDL)
-    get_ip_include_directories(INC_DIRS ${IP_LIB} SYSTEMRDL)
-    get_ip_compile_definitions(COMP_DEFS ${IP_LIB} SYSTEMRDL)
-
-    if(NOT RDL_SOURCES)
-        message(FATAL_ERROR "Library ${IP_LIB} does not have SYSTEMRDL_SOURCES property set,
-                unable to run ${CMAKE_CURRENT_FUNCTION}")
-    endif()
-
-    unset(INCDIRS_ARG)
-    foreach(__incdir ${INC_DIRS})
-        list(APPEND INCDIRS_ARG -I${__incdir})
-    endforeach()
-
-    unset(COMPDEFS_ARG)
-    foreach(__compdefs ${COMP_DEFS})
-        list(APPEND COMPDEFS_ARG -D${__compdefs})
-    endforeach()
-
-    # Generate the regblock and wrapper
-    find_python3()
-
-    # Create the reblog_wrap python command
-    set(__CMD ${Python3_EXECUTABLE} -m peakrdl regblock_wrap
-        --rename ${REGBLOCK_NAME}
-        ${INCDIRS_ARG}
-        ${COMPDEFS_ARG}
-        ${INTF_ARG}
-        ${RESET_ARG}
-        ${TMR_OPT}
-        -o ${OUTDIR}
-        ${RDL_SOURCES}
-    )
-
-    set(STAMP_FILE "${BINARY_DIR}/${IP_LIB}_${CMAKE_CURRENT_FUNCTION}.stamp")
-
-    # Regblock generated files (pkg + logic)
-    set(REGBLOCK_SV_GEN
-        ${OUTDIR}/${REGBLOCK_NAME}_pkg.sv
-        ${OUTDIR}/${REGBLOCK_NAME}.sv
-    )
-    # Top module wraper file generate
-    set(WRAP_SV_GEN ${OUTDIR}/${IP_NAME}.sv)
-
-    # Add the custom command to call the peakrdl regblock_wrap plugin
-    add_custom_command(
-        # The output files are automtically marked as GENERATED (deleted by make clean among other things)
-        OUTPUT ${REGBLOCK_SV_GEN} ${WRAP_SV_GEN} ${STAMP_FILE}
-        COMMAND ${__CMD}
-        COMMAND touch ${STAMP_FILE}
-        DEPENDS ${RDL_SOURCES}
-        COMMENT "Running ${CMAKE_CURRENT_FUNCTION} on ${IP_LIB}"
-    )
-
-    # This target triggers the custom command generating the top wrapper and the register file block
-    set(TNAME ${IP_LIB}_regblock_wrap)
-    add_custom_target(
-        ${TNAME}
-        DEPENDS ${REGBLOCK_SV_GEN} ${WRAP_SV_GEN} ${STAMP_FILE}
-    )
-
-    # Set the generated sources to the output variable
-    if(ARG_OUT_LIST)
-        set(${ARG_OUT_LIST} ${REGBLOCK_SV_GEN} ${WRAP_SV_GEN} PARENT_SCOPE)
-    endif()
-
-    # Add dependency to the IP
-    add_dependencies(${IP_LIB} ${IP_LIB}_regblock_wrap)
-endfunction()
-