diff --git a/arch/arm/arm-v7m/cortex-m3/gcc/port_s.S b/arch/arm/arm-v7m/cortex-m3/gcc/port_s.S
index d9f6aa37..8d172970 100644
--- a/arch/arm/arm-v7m/cortex-m3/gcc/port_s.S
+++ b/arch/arm/arm-v7m/cortex-m3/gcc/port_s.S
@@ -106,7 +106,6 @@ PendSV_Handler:
     SUBS    R0, R0, #0x20
     STM     R0, {R4 - R11}
 
-
     LDR     R1, =k_curr_task
     LDR     R1, [R1]
     STR     R0, [R1]
diff --git a/arch/arm/arm-v7m/cortex-m3/iccarm/port_config.h b/arch/arm/arm-v7m/cortex-m3/iccarm/port_config.h
index 9988f682..caa47cdb 100644
--- a/arch/arm/arm-v7m/cortex-m3/iccarm/port_config.h
+++ b/arch/arm/arm-v7m/cortex-m3/iccarm/port_config.h
@@ -26,11 +26,5 @@
 #define TOS_CFG_CPU_LEAD_ZEROS_ASM_PRESENT      1u
 #define TOS_CFG_CPU_BYTE_ORDER                  CPU_BYTE_ORDER_LITTLE_ENDIAN
 
-#ifndef __ARMVFP__
-#define TOS_CFG_CPU_ARM_FPU_EN 0u
-#else
-#define TOS_CFG_CPU_ARM_FPU_EN 1u
-#endif
-
 #endif /* _PORT_CONFIG_H_ */
 
diff --git a/arch/arm/arm-v7m/cortex-m3/iccarm/port_s.S b/arch/arm/arm-v7m/cortex-m3/iccarm/port_s.S
index 76bd6678..215afcfc 100644
--- a/arch/arm/arm-v7m/cortex-m3/iccarm/port_s.S
+++ b/arch/arm/arm-v7m/cortex-m3/iccarm/port_s.S
@@ -88,11 +88,6 @@ port_sched_start
     ; restore r4-11 from new process stack
     LDMFD   SP!, {R4 - R11}
 
-    #if defined(__ARMVFP__)
-    ; ignore EXC_RETURN the first switch
-    LDMFD   SP!, {R0}
-    #endif
-
     ; restore r0, r3
     LDMFD    SP!, {R0 - R3}
     ; load R12 and LR
@@ -124,16 +119,6 @@ PendSV_Handler
 
 _context_save
     ; R0-R3, R12, LR, PC, xPSR is saved automatically here
-    #if defined(__ARMVFP__)
-    ; is it extended frame?
-    TST     LR, #0x10
-    IT      EQ
-    VSTMDBEQ  R0!, {S16 - S31}
-    ; S0 - S16, FPSCR saved automatically here
-
-    ; save EXC_RETURN
-    STMFD   R0!, {LR}
-    #endif
 
     ; save remaining regs r4-11 on process stack
     STMFD   R0!, {R4 - R11}
@@ -156,15 +141,6 @@ _context_restore
     ; restore R4 - R11
     LDMFD   R0!, {R4 - R11}
 
-    #if defined(__ARMVFP__)
-    ; restore EXC_RETURN
-    LDMFD   R0!, {LR}
-    ; is it extended frame?
-    TST     LR, #0x10
-    IT      EQ
-    VLDMIAEQ    R0!, {S16 - S31}
-    #endif
-
     ; Load PSP with new process SP
     MSR     PSP, R0
     CPSIE   I