diff --git a/portable/XCC/XCORE200/portmacro.h b/portable/XCC/XCORE200/portmacro.h
index b22aff1df..0a42fc3f3 100644
--- a/portable/XCC/XCORE200/portmacro.h
+++ b/portable/XCC/XCORE200/portmacro.h
@@ -110,8 +110,6 @@ do \
 #define portGET_INTERRUPT_STATE() rtos_interrupt_mask_get()
 #define portDISABLE_INTERRUPTS() rtos_interrupt_mask_all()
 #define portENABLE_INTERRUPTS() rtos_interrupt_unmask_all()
-#define portSET_INTERRUPT_MASK_FROM_ISR() 0
-#define portCLEAR_INTERRUPT_MASK_FROM_ISR(x)
 /*
  * Will enable interrupts if ulState is non-zero.
  */
diff --git a/portable/XCC/XCOREAI/portmacro.h b/portable/XCC/XCOREAI/portmacro.h
index b22aff1df..0a42fc3f3 100644
--- a/portable/XCC/XCOREAI/portmacro.h
+++ b/portable/XCC/XCOREAI/portmacro.h
@@ -110,8 +110,6 @@ do \
 #define portGET_INTERRUPT_STATE() rtos_interrupt_mask_get()
 #define portDISABLE_INTERRUPTS() rtos_interrupt_mask_all()
 #define portENABLE_INTERRUPTS() rtos_interrupt_unmask_all()
-#define portSET_INTERRUPT_MASK_FROM_ISR() 0
-#define portCLEAR_INTERRUPT_MASK_FROM_ISR(x)
 /*
  * Will enable interrupts if ulState is non-zero.
  */
diff --git a/timers.c b/timers.c
index a84c7b8b8..6166e338f 100644
--- a/timers.c
+++ b/timers.c
@@ -1,7 +1,6 @@
 /*
  * FreeRTOS Kernel V10.4.3
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
-
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in