diff --git a/board/cr50/tpm2/NVMem.c b/board/cr50/tpm2/NVMem.c
index 695debe26c..f78308033c 100644
--- a/board/cr50/tpm2/NVMem.c
+++ b/board/cr50/tpm2/NVMem.c
@@ -213,12 +213,3 @@ void _plat__ClearNvAvail(void)
 	s_NvIsAvailable = FALSE;
 	return;
 }
-
-void wipe_nvram(void)
-{
-#ifdef CONFIG_FLASH_NVMEM
-	nvmem_setup(0);
-#else
-	memset(s_NV, 0xff, sizeof(s_NV));
-#endif
-}
diff --git a/board/cr50/tpm2/memory.h b/board/cr50/tpm2/memory.h
deleted file mode 100644
index fc79db2778..0000000000
--- a/board/cr50/tpm2/memory.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Copyright 2015 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __EC_BOARD_CR50_TPM2_MEMORY_H
-#define __EC_BOARD_CR50_TPM2_MEMORY_H
-
-/* A function to reinitialize the TPM NVram. */
-void wipe_nvram(void);
-
-#endif /* __EC_BOARD_CR50_TPM2_MEMORY_H */
diff --git a/chip/g/upgrade_fw.c b/chip/g/upgrade_fw.c
index 8cc79eaafa..a1c52cb56a 100644
--- a/chip/g/upgrade_fw.c
+++ b/chip/g/upgrade_fw.c
@@ -10,7 +10,6 @@
 #include "flash.h"
 #include "hooks.h"
 #include "include/compile_time_macros.h"
-#include "memory.h"
 #include "system.h"
 #include "registers.h"
 #include "uart.h"