diff --git a/script_support/components/M2/DEFAULT/ADD_M2_INTERFACE.tcl b/script_support/components/M2/DEFAULT/ADD_M2_INTERFACE.tcl
index 1f6f3edc309f59fdbb5830f501e5f84e8932262b..2091e9067bda8591d0a3928a9f62e7aba43317e1 100644
--- a/script_support/components/M2/DEFAULT/ADD_M2_INTERFACE.tcl
+++ b/script_support/components/M2/DEFAULT/ADD_M2_INTERFACE.tcl
@@ -66,14 +66,6 @@ sd_connect_pins -sd_name ${sd_name} -pin_names {"M2_INTERFACE_0:PCIE_INTERRUPT"
sd_connect_pins -sd_name ${sd_name} -pin_names {"M2_INTERFACE_0:M2_PERST0n" "M2_PERST0n"}
-sd_connect_pin_to_port -sd_name ${sd_name} -pin_name {M2_INTERFACE_0:M2_UART_WAKEn} -port_name {}
-
-sd_connect_pin_to_port -sd_name ${sd_name} -pin_name {M2_INTERFACE_0:M2_CLKREQ0n} -port_name {}
-sd_connect_pin_to_port -sd_name ${sd_name} -pin_name {M2_INTERFACE_0:M2_W_DISABLE1n} -port_name {}
-sd_connect_pin_to_port -sd_name ${sd_name} -pin_name {M2_INTERFACE_0:M2_W_DISABLE2n} -port_name {}
-sd_connect_pin_to_port -sd_name ${sd_name} -pin_name {M2_INTERFACE_0:M2_PEWAKEn} -port_name {}
-sd_connect_pin_to_port -sd_name ${sd_name} -pin_name {M2_INTERFACE_0:M2_I2C_ALTn} -port_name {}
-
sd_connect_pins -sd_name ${sd_name} -pin_names {"BVF_RISCV_SUBSYSTEM:M2_UART_RXD" "M2_UART_RXD" }
sd_connect_pins -sd_name ${sd_name} -pin_names {"BVF_RISCV_SUBSYSTEM:M2_UART_TXD" "M2_UART_TXD" }
sd_connect_pins -sd_name ${sd_name} -pin_names {"BVF_RISCV_SUBSYSTEM:M2_UART_RTS" "M2_UART_RTS" }
diff --git a/script_support/components/M2/DEFAULT/M2_INTERFACE.tcl b/script_support/components/M2/DEFAULT/M2_INTERFACE.tcl
index f5809161bd344c930f32f9179abd93afa6c4b90b..52afb8214548a7c75f46a58503bb9d4120a8d74f 100644
--- a/script_support/components/M2/DEFAULT/M2_INTERFACE.tcl
+++ b/script_support/components/M2/DEFAULT/M2_INTERFACE.tcl
@@ -20,14 +20,6 @@ sd_create_scalar_port -sd_name ${sd_name} -port_name {PCIE_INTERRUPT} -port_dire
sd_create_scalar_port -sd_name ${sd_name} -port_name {M2_PERST0n} -port_direction {OUT}
-sd_create_scalar_port -sd_name ${sd_name} -port_name {M2_UART_WAKEn} -port_direction {OUT}
-
-sd_create_scalar_port -sd_name ${sd_name} -port_name {M2_CLKREQ0n} -port_direction {IN}
-sd_create_scalar_port -sd_name ${sd_name} -port_name {M2_W_DISABLE1n} -port_direction {OUT}
-sd_create_scalar_port -sd_name ${sd_name} -port_name {M2_W_DISABLE2n} -port_direction {OUT}
-sd_create_scalar_port -sd_name ${sd_name} -port_name {M2_PEWAKEn} -port_direction {IN}
-sd_create_scalar_port -sd_name ${sd_name} -port_name {M2_I2C_ALTn} -port_direction {IN}
-
#-------------------------------------------------------------------------------
# Instantiate components
#-------------------------------------------------------------------------------
@@ -93,18 +85,6 @@ sd_rename_port -sd_name ${sd_name} -current_port_name {INIT_DONE} -new_port_name
sd_connect_pins -sd_name ${sd_name} -pin_names {"M2_PERST0n" "PCIE:PCIE_0_PERST_OUT_N"}
-#-------------------------------------------------------------------------------
-# Temporary - rework once pin assignment confirmed.
-#-------------------------------------------------------------------------------
-sd_instantiate_macro -sd_name ${sd_name} -macro_name {AND2} -instance_name {AND2_0}
-sd_connect_pins -sd_name ${sd_name} -pin_names {"AND2_0:Y" "M2_W_DISABLE1n"}
-sd_connect_pins -sd_name ${sd_name} -pin_names {"AND2_0:A" "M2_CLKREQ0n"}
-sd_connect_pins -sd_name ${sd_name} -pin_names {"AND2_0:B" "M2_PEWAKEn"}
-
-sd_connect_pins -sd_name ${sd_name} -pin_names {"M2_I2C_ALTn" "M2_W_DISABLE2n"}
-
-sd_connect_pins_to_constant -sd_name ${sd_name} -pin_names {M2_UART_WAKEn} -value {VCC}
-
#-------------------------------------------------------------------------------
# Re-enable auto promotion of pins of type 'pad'
diff --git a/script_support/components/M2/DEFAULT/constraints/M2.pdc b/script_support/components/M2/DEFAULT/constraints/M2.pdc
index 4b283193e857fcfb552efc722d1155c75fbef714..199618beef657e5291b84b5301a020179c2caa49 100644
--- a/script_support/components/M2/DEFAULT/constraints/M2.pdc
+++ b/script_support/components/M2/DEFAULT/constraints/M2.pdc
@@ -22,48 +22,12 @@ set_io -port_name M2_UART_RTS \
-DIRECTION OUTPUT
-set_io -port_name M2_UART_WAKEn \
- -pin_name T15 \
- -fixed true \
- -DIRECTION INPUT
-
-
set_io -port_name M2_PERST0n \
-pin_name Y18 \
-fixed true \
-DIRECTION OUTPUT
-set_io -port_name M2_CLKREQ0n \
- -pin_name W19 \
- -fixed true \
- -DIRECTION INPUT
-
-
-set_io -port_name M2_W_DISABLE1n \
- -pin_name U19 \
- -fixed true \
- -DIRECTION OUTPUT
-
-
-set_io -port_name M2_W_DISABLE2n \
- -pin_name R15 \
- -fixed true \
- -DIRECTION OUTPUT
-
-
-set_io -port_name M2_PEWAKEn \
- -pin_name R14 \
- -fixed true \
- -DIRECTION INPUT
-
-
-set_io -port_name M2_I2C_ALTn \
- -pin_name U15 \
- -fixed true \
- -DIRECTION INPUT
-
-
set_io -port_name M2_PET0_N \
-pin_name F21 \
-DIRECTION OUTPUT