diff --git a/elfloader-tool/src/plat/apq8064/platform_init.c b/elfloader-tool/src/plat/apq8064/platform_init.c
deleted file mode 100644
index 42dabfa0..00000000
--- a/elfloader-tool/src/plat/apq8064/platform_init.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2021, Data61, CSIRO (ABN 41 687 119 230)
- *
- * SPDX-License-Identifier: GPL-2.0-only
- */
-
-#include <autoconf.h>
-#include <mode/arm_generic_timer.h>
-
-/* Reset the virtual offset for the platform timer to 0 */
-void platform_init(void)
-{
-    reset_cntvoff();
-}
-
-#if CONFIG_MAX_NUM_NODES > 1
-void non_boot_init(void)
-{
-    reset_cntvoff();
-}
-#endif
diff --git a/elfloader-tool/src/plat/bcm2711/platform_init.c b/elfloader-tool/src/plat/bcm2711/platform_init.c
deleted file mode 100644
index 42dabfa0..00000000
--- a/elfloader-tool/src/plat/bcm2711/platform_init.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2021, Data61, CSIRO (ABN 41 687 119 230)
- *
- * SPDX-License-Identifier: GPL-2.0-only
- */
-
-#include <autoconf.h>
-#include <mode/arm_generic_timer.h>
-
-/* Reset the virtual offset for the platform timer to 0 */
-void platform_init(void)
-{
-    reset_cntvoff();
-}
-
-#if CONFIG_MAX_NUM_NODES > 1
-void non_boot_init(void)
-{
-    reset_cntvoff();
-}
-#endif
diff --git a/elfloader-tool/src/plat/bcm2837/platform_init.c b/elfloader-tool/src/plat/bcm2837/platform_init.c
deleted file mode 100644
index 42dabfa0..00000000
--- a/elfloader-tool/src/plat/bcm2837/platform_init.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2021, Data61, CSIRO (ABN 41 687 119 230)
- *
- * SPDX-License-Identifier: GPL-2.0-only
- */
-
-#include <autoconf.h>
-#include <mode/arm_generic_timer.h>
-
-/* Reset the virtual offset for the platform timer to 0 */
-void platform_init(void)
-{
-    reset_cntvoff();
-}
-
-#if CONFIG_MAX_NUM_NODES > 1
-void non_boot_init(void)
-{
-    reset_cntvoff();
-}
-#endif
diff --git a/elfloader-tool/src/plat/exynos5/platform_init.c b/elfloader-tool/src/plat/exynos5/platform_init.c
index 4ae24903..5425461f 100644
--- a/elfloader-tool/src/plat/exynos5/platform_init.c
+++ b/elfloader-tool/src/plat/exynos5/platform_init.c
@@ -8,7 +8,6 @@
 #include <printf.h>
 #include <types.h>
 #include <cpuid.h>
-#include <mode/arm_generic_timer.h>
 
 #include <elfloader.h>
 
@@ -92,15 +91,4 @@ void platform_init(void)
         nsscode->cpu1_boot_reg = 0;
         smc(SMC_DISABLE_TRUSTZONE, 0, 0, 0);
     }
-
-    /* Reset the virtual offset for the platform timer to 0 */
-    reset_cntvoff();
-}
-
-#if CONFIG_MAX_NUM_NODES > 1
-void non_boot_init(void)
-{
-    /* Reset the virtual offset for the platform timer to 0 */
-    reset_cntvoff();
 }
-#endif
diff --git a/elfloader-tool/src/plat/fvp/platform_init.c b/elfloader-tool/src/plat/fvp/platform_init.c
index 161c994b..f4204198 100644
--- a/elfloader-tool/src/plat/fvp/platform_init.c
+++ b/elfloader-tool/src/plat/fvp/platform_init.c
@@ -5,7 +5,6 @@
  */
 
 #include <autoconf.h>
-#include <mode/arm_generic_timer.h>
 
 void platform_init(void)
 {
@@ -21,14 +20,4 @@ void platform_init(void)
                  "msr tpidr_el0, x0\n"
                  ::: "x0");
 
-    /* Reset the virtual offset for the platform timer to 0 */
-    reset_cntvoff();
 }
-
-#if CONFIG_MAX_NUM_NODES > 1
-void non_boot_init(void)
-{
-    /* Reset the virtual offset for the platform timer to 0 */
-    reset_cntvoff();
-}
-#endif
diff --git a/elfloader-tool/src/plat/hikey/platform_init.c b/elfloader-tool/src/plat/hikey/platform_init.c
deleted file mode 100644
index 42dabfa0..00000000
--- a/elfloader-tool/src/plat/hikey/platform_init.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2021, Data61, CSIRO (ABN 41 687 119 230)
- *
- * SPDX-License-Identifier: GPL-2.0-only
- */
-
-#include <autoconf.h>
-#include <mode/arm_generic_timer.h>
-
-/* Reset the virtual offset for the platform timer to 0 */
-void platform_init(void)
-{
-    reset_cntvoff();
-}
-
-#if CONFIG_MAX_NUM_NODES > 1
-void non_boot_init(void)
-{
-    reset_cntvoff();
-}
-#endif
diff --git a/elfloader-tool/src/plat/imx7/platform_init.c b/elfloader-tool/src/plat/imx7/platform_init.c
deleted file mode 100644
index 42dabfa0..00000000
--- a/elfloader-tool/src/plat/imx7/platform_init.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2021, Data61, CSIRO (ABN 41 687 119 230)
- *
- * SPDX-License-Identifier: GPL-2.0-only
- */
-
-#include <autoconf.h>
-#include <mode/arm_generic_timer.h>
-
-/* Reset the virtual offset for the platform timer to 0 */
-void platform_init(void)
-{
-    reset_cntvoff();
-}
-
-#if CONFIG_MAX_NUM_NODES > 1
-void non_boot_init(void)
-{
-    reset_cntvoff();
-}
-#endif
diff --git a/elfloader-tool/src/plat/imx8m-evk/platform_init.c b/elfloader-tool/src/plat/imx8m-evk/platform_init.c
deleted file mode 100644
index 42dabfa0..00000000
--- a/elfloader-tool/src/plat/imx8m-evk/platform_init.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2021, Data61, CSIRO (ABN 41 687 119 230)
- *
- * SPDX-License-Identifier: GPL-2.0-only
- */
-
-#include <autoconf.h>
-#include <mode/arm_generic_timer.h>
-
-/* Reset the virtual offset for the platform timer to 0 */
-void platform_init(void)
-{
-    reset_cntvoff();
-}
-
-#if CONFIG_MAX_NUM_NODES > 1
-void non_boot_init(void)
-{
-    reset_cntvoff();
-}
-#endif
diff --git a/elfloader-tool/src/plat/maaxboard/platform_init.c b/elfloader-tool/src/plat/maaxboard/platform_init.c
deleted file mode 100644
index 78302edf..00000000
--- a/elfloader-tool/src/plat/maaxboard/platform_init.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2021, Data61, CSIRO (ABN 41 687 119 230)
- * Copyright 2022, Capgemini Engineering
- *
- * SPDX-License-Identifier: GPL-2.0-only
- */
-
-#include <autoconf.h>
-#include <mode/arm_generic_timer.h>
-
-/* Reset the virtual offset for the platform timer to 0 */
-void platform_init(void)
-{
-    reset_cntvoff();
-}
-
-#if CONFIG_MAX_NUM_NODES > 1
-void non_boot_init(void)
-{
-    reset_cntvoff();
-}
-#endif
diff --git a/elfloader-tool/src/plat/odroidc2/platform_init.c b/elfloader-tool/src/plat/odroidc2/platform_init.c
deleted file mode 100644
index 42dabfa0..00000000
--- a/elfloader-tool/src/plat/odroidc2/platform_init.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2021, Data61, CSIRO (ABN 41 687 119 230)
- *
- * SPDX-License-Identifier: GPL-2.0-only
- */
-
-#include <autoconf.h>
-#include <mode/arm_generic_timer.h>
-
-/* Reset the virtual offset for the platform timer to 0 */
-void platform_init(void)
-{
-    reset_cntvoff();
-}
-
-#if CONFIG_MAX_NUM_NODES > 1
-void non_boot_init(void)
-{
-    reset_cntvoff();
-}
-#endif
diff --git a/elfloader-tool/src/plat/odroidc4/platform_init.c b/elfloader-tool/src/plat/odroidc4/platform_init.c
deleted file mode 100644
index 42dabfa0..00000000
--- a/elfloader-tool/src/plat/odroidc4/platform_init.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2021, Data61, CSIRO (ABN 41 687 119 230)
- *
- * SPDX-License-Identifier: GPL-2.0-only
- */
-
-#include <autoconf.h>
-#include <mode/arm_generic_timer.h>
-
-/* Reset the virtual offset for the platform timer to 0 */
-void platform_init(void)
-{
-    reset_cntvoff();
-}
-
-#if CONFIG_MAX_NUM_NODES > 1
-void non_boot_init(void)
-{
-    reset_cntvoff();
-}
-#endif
diff --git a/elfloader-tool/src/plat/qemu-arm-virt/platform_init.c b/elfloader-tool/src/plat/qemu-arm-virt/platform_init.c
deleted file mode 100644
index 42dabfa0..00000000
--- a/elfloader-tool/src/plat/qemu-arm-virt/platform_init.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2021, Data61, CSIRO (ABN 41 687 119 230)
- *
- * SPDX-License-Identifier: GPL-2.0-only
- */
-
-#include <autoconf.h>
-#include <mode/arm_generic_timer.h>
-
-/* Reset the virtual offset for the platform timer to 0 */
-void platform_init(void)
-{
-    reset_cntvoff();
-}
-
-#if CONFIG_MAX_NUM_NODES > 1
-void non_boot_init(void)
-{
-    reset_cntvoff();
-}
-#endif
diff --git a/elfloader-tool/src/plat/quartz64/platform_init.c b/elfloader-tool/src/plat/quartz64/platform_init.c
deleted file mode 100644
index 42dabfa0..00000000
--- a/elfloader-tool/src/plat/quartz64/platform_init.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2021, Data61, CSIRO (ABN 41 687 119 230)
- *
- * SPDX-License-Identifier: GPL-2.0-only
- */
-
-#include <autoconf.h>
-#include <mode/arm_generic_timer.h>
-
-/* Reset the virtual offset for the platform timer to 0 */
-void platform_init(void)
-{
-    reset_cntvoff();
-}
-
-#if CONFIG_MAX_NUM_NODES > 1
-void non_boot_init(void)
-{
-    reset_cntvoff();
-}
-#endif
diff --git a/elfloader-tool/src/plat/rockpro64/platform_init.c b/elfloader-tool/src/plat/rockpro64/platform_init.c
deleted file mode 100644
index 42dabfa0..00000000
--- a/elfloader-tool/src/plat/rockpro64/platform_init.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2021, Data61, CSIRO (ABN 41 687 119 230)
- *
- * SPDX-License-Identifier: GPL-2.0-only
- */
-
-#include <autoconf.h>
-#include <mode/arm_generic_timer.h>
-
-/* Reset the virtual offset for the platform timer to 0 */
-void platform_init(void)
-{
-    reset_cntvoff();
-}
-
-#if CONFIG_MAX_NUM_NODES > 1
-void non_boot_init(void)
-{
-    reset_cntvoff();
-}
-#endif
diff --git a/elfloader-tool/src/plat/tk1/platform_init.c b/elfloader-tool/src/plat/tk1/platform_init.c
index 4ea6da26..d3daa369 100644
--- a/elfloader-tool/src/plat/tk1/platform_init.c
+++ b/elfloader-tool/src/plat/tk1/platform_init.c
@@ -5,7 +5,6 @@
  */
 
 #include <autoconf.h>
-#include <mode/arm_generic_timer.h>
 #include <elfloader/gen_config.h>
 #include <elfloader.h>
 #include <printf.h>
@@ -309,14 +308,4 @@ void platform_init(void)
     switch_to_mon_mode();
 #endif
 
-    /* Reset the virtual offset for the platform timer to 0 */
-    reset_cntvoff();
 }
-
-#if CONFIG_MAX_NUM_NODES > 1
-void non_boot_init(void)
-{
-    /* Reset the virtual offset for the platform timer to 0 */
-    reset_cntvoff();
-}
-#endif
diff --git a/elfloader-tool/src/plat/tqma8xqp1gb/platform_init.c b/elfloader-tool/src/plat/tqma8xqp1gb/platform_init.c
deleted file mode 100644
index 42dabfa0..00000000
--- a/elfloader-tool/src/plat/tqma8xqp1gb/platform_init.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2021, Data61, CSIRO (ABN 41 687 119 230)
- *
- * SPDX-License-Identifier: GPL-2.0-only
- */
-
-#include <autoconf.h>
-#include <mode/arm_generic_timer.h>
-
-/* Reset the virtual offset for the platform timer to 0 */
-void platform_init(void)
-{
-    reset_cntvoff();
-}
-
-#if CONFIG_MAX_NUM_NODES > 1
-void non_boot_init(void)
-{
-    reset_cntvoff();
-}
-#endif
diff --git a/elfloader-tool/src/plat/tx1/platform_init.c b/elfloader-tool/src/plat/tx1/platform_init.c
deleted file mode 100644
index 42dabfa0..00000000
--- a/elfloader-tool/src/plat/tx1/platform_init.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2021, Data61, CSIRO (ABN 41 687 119 230)
- *
- * SPDX-License-Identifier: GPL-2.0-only
- */
-
-#include <autoconf.h>
-#include <mode/arm_generic_timer.h>
-
-/* Reset the virtual offset for the platform timer to 0 */
-void platform_init(void)
-{
-    reset_cntvoff();
-}
-
-#if CONFIG_MAX_NUM_NODES > 1
-void non_boot_init(void)
-{
-    reset_cntvoff();
-}
-#endif
diff --git a/elfloader-tool/src/plat/tx2/platform_init.c b/elfloader-tool/src/plat/tx2/platform_init.c
index d6432094..9f9118af 100644
--- a/elfloader-tool/src/plat/tx2/platform_init.c
+++ b/elfloader-tool/src/plat/tx2/platform_init.c
@@ -5,7 +5,6 @@
  */
 
 #include <autoconf.h>
-#include <mode/arm_generic_timer.h>
 #include <elfloader.h>
 #include <printf.h>
 
@@ -84,15 +83,4 @@ static void enable_serr(void)
 void platform_init(void)
 {
     enable_serr();
-
-    /* Reset the virtual offset for the platform timer to 0 */
-    reset_cntvoff();
-}
-
-#if CONFIG_MAX_NUM_NODES > 1
-void non_boot_init(void)
-{
-    /* Reset the virtual offset for the platform timer to 0 */
-    reset_cntvoff();
 }
-#endif
diff --git a/elfloader-tool/src/plat/zynqmp/platform_init.c b/elfloader-tool/src/plat/zynqmp/platform_init.c
deleted file mode 100644
index 42dabfa0..00000000
--- a/elfloader-tool/src/plat/zynqmp/platform_init.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2021, Data61, CSIRO (ABN 41 687 119 230)
- *
- * SPDX-License-Identifier: GPL-2.0-only
- */
-
-#include <autoconf.h>
-#include <mode/arm_generic_timer.h>
-
-/* Reset the virtual offset for the platform timer to 0 */
-void platform_init(void)
-{
-    reset_cntvoff();
-}
-
-#if CONFIG_MAX_NUM_NODES > 1
-void non_boot_init(void)
-{
-    reset_cntvoff();
-}
-#endif