diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW24D/TARGET_FRDM/PeripheralPins.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW24D/TARGET_FRDM/PeripheralPins.c
index a8c86694f8..fedd056984 100644
--- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW24D/TARGET_FRDM/PeripheralPins.c
+++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW24D/TARGET_FRDM/PeripheralPins.c
@@ -16,47 +16,6 @@
 
 #include "PeripheralPins.h"
 
-/************GPIO***************/
-const PinMap PinMap_GPIO[] = {
-    {PTA0, GPIO_X, 1},
-    {PTA1, GPIO_X, 1},
-    {PTA2, GPIO_X, 1},
-    {PTA3, GPIO_X, 1},
-    {PTA4, GPIO_X, 1},
-    {PTA18, GPIO_X, 1},
-    {PTA19, GPIO_X, 1},
-
-    {PTC4, GPIO_X, 1},
-    {PTC5, GPIO_X, 1},
-    {PTC6, GPIO_X, 1},
-    {PTC7, GPIO_X, 1},
-
-    {PTD1, GPIO_X, 1},
-    {PTD2, GPIO_X, 1},
-    {PTD3, GPIO_X, 1},
-    {PTD4, GPIO_X, 1},
-    {PTD5, GPIO_X, 1},
-    {PTD6, GPIO_X, 1},
-    {PTD7, GPIO_X, 1},
-
-    {PTE0, GPIO_X, 1},
-    {PTE1, GPIO_X, 1},
-    {PTE2, GPIO_X, 1},
-    {PTE3, GPIO_X, 1},
-    {PTE4, GPIO_X, 1},
-    {PTE16, GPIO_X, 1},
-    {PTE17, GPIO_X, 1},
-    {PTE18, GPIO_X, 1},
-    {PTE19, GPIO_X, 1},
-
-    {NC   , NC    , 0}
-};
-
-const PinMap *gpio_pinmap()
-{
-    return PinMap_GPIO;
-}
-
 /************RTC***************/
 const PinMap PinMap_RTC[] = {
     {NC, OSC32KCLK, 0},
@@ -75,7 +34,7 @@ const PinMap PinMap_ADC[] = {
     {PTE17, ADC0_SE5a, 0},
     {PTE18, ADC0_SE6a, 0},
     {PTE19, ADC0_SE7a, 0},
-    {NC   , NC       , 0}
+    {NC, NC, 0}
 };
 
 /************I2C***************/
@@ -83,14 +42,14 @@ const PinMap PinMap_I2C_SDA[] = {
     {PTD3,  I2C_0, 4},
     {PTE0,  I2C_1, 6},
     {PTE18, I2C_0, 4},
-    {NC   , NC   , 0}
+    {NC, NC, 0}
 };
 
 const PinMap PinMap_I2C_SCL[] = {
     {PTD2,  I2C_0, 4},
     {PTE1,  I2C_1, 6},
     {PTE19, I2C_0, 4},
-    {NC   , NC   , 0}
+    {NC, NC, 0}
 };
 
 /************UART***************/
@@ -101,7 +60,7 @@ const PinMap PinMap_UART_TX[] = {
     {PTE0,  UART_1, 3},
     {PTD3,  UART_2, 3},
     {PTE16, UART_2, 3},
-    {NC   , NC    , 0}
+    {NC, NC, 0}
 };
 
 const PinMap PinMap_UART_RX[] = {
@@ -111,7 +70,7 @@ const PinMap PinMap_UART_RX[] = {
     {PTD2,  UART_2, 3},
     {PTE17, UART_2, 3},
 
-    {NC   , NC    , 0}
+    {NC, NC, 0}
 };
 
 const PinMap PinMap_UART_CTS[] = {
@@ -120,15 +79,15 @@ const PinMap PinMap_UART_CTS[] = {
     {PTE2,  UART_1, 3},
     {PTE18, UART_2, 3},
     {PTA0,  UART_0, 2},
-    {NC   , NC    , 0}
+    {NC, NC, 0}
 };
 
 const PinMap PinMap_UART_RTS[] = {
     {PTD4,  UART_0, 3},
-    {PTE3 , UART_1, 3},
+    {PTE3, UART_1, 3},
     {PTE19, UART_2, 3},
     {PTA3,  UART_0, 2},
-    {NC   , NC    , 0}
+    {NC, NC, 0}
 };
 
 /************SPI***************/
@@ -138,7 +97,7 @@ const PinMap PinMap_SPI_SCLK[] = {
     {PTD1,  SPI_0, 2},
     {PTE2,  SPI_1, 2},
     {PTE17, SPI_0, 2},
-    {NC   , NC   , 0}
+    {NC, NC, 0}
 };
 
 const PinMap PinMap_SPI_MOSI[] = {
@@ -148,7 +107,7 @@ const PinMap PinMap_SPI_MOSI[] = {
     {PTE1,  SPI_1, 2},
     {PTE3,  SPI_1, 7},
     {PTE18, SPI_0, 2},
-    {NC   , NC   , 0}
+    {NC, NC, 0}
 };
 
 const PinMap PinMap_SPI_MISO[] = {
@@ -158,7 +117,7 @@ const PinMap PinMap_SPI_MISO[] = {
     {PTE1,  SPI_1, 7},
     {PTE3,  SPI_1, 2},
     {PTE19, SPI_0, 2},
-    {NC   , NC   , 0}
+    {NC, NC, 0}
 };
 
 const PinMap PinMap_SPI_SSEL[] = {
@@ -166,7 +125,7 @@ const PinMap PinMap_SPI_SSEL[] = {
     {PTC4,  SPI_0, 2},
     {PTE4,  SPI_1, 2},
     {PTE16, SPI_0, 2},
-    {NC   , NC   , 0}
+    {NC, NC, 0}
 };
 
 /************PWM***************/
@@ -181,5 +140,5 @@ const PinMap PinMap_PWM[] = {
     {PTA2,  PWM_7, 3},
     {PTA3,  PWM_0, 3},
     {PTA4,  PWM_1, 3},
-    {NC   , NC   , 0}
+    {NC, NC, 0}
 };
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW41Z/TARGET_FRDM/PeripheralPins.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW41Z/TARGET_FRDM/PeripheralPins.c
index e1fe4d8d3a..85ed416b46 100644
--- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW41Z/TARGET_FRDM/PeripheralPins.c
+++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW41Z/TARGET_FRDM/PeripheralPins.c
@@ -16,45 +16,6 @@
 
 #include "PeripheralPins.h"
 
-/************GPIO***************/
-const PinMap PinMap_GPIO[] = {
-    {PTA0, GPIO_X, 1},
-    {PTA1, GPIO_X, 1},
-    {PTA2, GPIO_X, 1},
-    {PTA16, GPIO_X, 1},
-    {PTA17, GPIO_X, 1},
-    {PTA18, GPIO_X, 1},
-    {PTA19, GPIO_X, 1},
-
-    {PTB0, GPIO_X, 1},
-    {PTB1, GPIO_X, 1},
-    {PTB2, GPIO_X, 1},
-    {PTB3, GPIO_X, 1},
-    {PTB16, GPIO_X, 1},
-    {PTB17, GPIO_X, 1},
-    {PTB18, GPIO_X, 1},
-
-    // {PTC0, GPIO_X, 1}, // PTC0 is not available on the 48-pin Laminate QFN package.
-    {PTC1, GPIO_X, 1},
-    {PTC2, GPIO_X, 1},
-    {PTC3, GPIO_X, 1},
-    {PTC4, GPIO_X, 1},
-    {PTC5, GPIO_X, 1},
-    {PTC6, GPIO_X, 1},
-    {PTC7, GPIO_X, 1},
-    {PTC16, GPIO_X, 1},
-    {PTC17, GPIO_X, 1},
-    {PTC18, GPIO_X, 1},
-    {PTC19, GPIO_X, 1},
-
-    {NC   , NC    , 0}
-};
-
-const PinMap *gpio_pinmap()
-{
-    return PinMap_GPIO;
-}
-
 /************RTC***************/
 const PinMap PinMap_RTC[] = {
     {NC, OSC32KCLK, 0},
@@ -67,7 +28,7 @@ const PinMap PinMap_ADC[] = {
     {PTB2,  ADC0_SE3, 0},
     {PTB18, ADC0_SE4, 0},
     {PTA19, ADC0_SE5, 0},
-    {NC   , NC       , 0}
+    {NC, NC, 0}
 };
 
 /************DAC***************/
@@ -85,7 +46,7 @@ const PinMap PinMap_I2C_SDA[] = {
     {PTC7, I2C_1, 3},
     {PTC16, I2C_0, 3},
     {PTC18, I2C_1, 3},
-    {NC   , NC   , 0}
+    {NC, NC, 0}
 };
 
 const PinMap PinMap_I2C_SCL[] = {
@@ -96,7 +57,7 @@ const PinMap PinMap_I2C_SCL[] = {
     {PTC6, I2C_1, 3},
     {PTC17, I2C_1, 3},
     {PTC19, I2C_0, 3},
-    {NC   , NC   , 0}
+    {NC, NC, 0}
 };
 
 /************UART***************/
@@ -104,53 +65,53 @@ const PinMap PinMap_UART_TX[] = {
     {PTC3,  LPUART_0, 4},
     {PTC7,  LPUART_0, 4},
     {PTC18, LPUART_0, 4},
-    {NC   , NC    , 0}
+    {NC, NC, 0}
 };
 
 const PinMap PinMap_UART_RX[] = {
     {PTC2,  LPUART_0, 4},
     {PTC6,  LPUART_0, 4},
     {PTC17, LPUART_0, 4},
-    {NC   , NC    , 0}
+    {NC, NC, 0}
 };
 
 const PinMap PinMap_UART_CTS[] = {
     {PTC4,  LPUART_0, 4},
     {PTC19, LPUART_0, 4},
-    {NC   , NC    , 0}
+    {NC, NC, 0}
 };
 
 const PinMap PinMap_UART_RTS[] = {
     {PTC1,  LPUART_0, 4},
     {PTC5,  LPUART_0, 4},
     {PTC16, LPUART_0, 4},
-    {NC   , NC    , 0}
+    {NC, NC, 0}
 };
 
 /************SPI***************/
 const PinMap PinMap_SPI_SCLK[] = {
     {PTA18, SPI_1, 2},
     {PTC16,  SPI_0, 2},
-    {NC   , NC   , 0}
+    {NC, NC, 0}
 };
 
 const PinMap PinMap_SPI_MOSI[] = {
     {PTA16, SPI_1, 2},
     {PTC17,  SPI_0, 2},
-    {NC   , NC   , 0}
+    {NC, NC, 0}
 };
 
 const PinMap PinMap_SPI_MISO[] = {
     {PTA17, SPI_1, 2},
     {PTC18,  SPI_0, 2},
-    {NC   , NC   , 0}
+    {NC, NC, 0}
 };
 
 const PinMap PinMap_SPI_SSEL[] = {
     {PTA1,  SPI_1, 2},
     {PTA19, SPI_1, 2},
     {PTC19,  SPI_0, 2},
-    {NC   , NC   , 0}
+    {NC, NC, 0}
 };
 
 /************PWM***************/
@@ -171,5 +132,5 @@ const PinMap PinMap_PWM[] = {
     {PTB3,  PWM_6, 5},
     {PTC4,  PWM_5, 5},
     {PTC5,  PWM_6, 5},
-    {NC   , NC   , 0}
+    {NC, NC, 0}
 };