diff --git a/flashrom.c b/flashrom.c
index 453a2bf71..01a41c4d3 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -1327,7 +1327,7 @@ static int selfcheck_eraseblocks(const struct flashchip *chip)
 	return ret;
 }
 
-static int erase_by_layout_new(struct flashctx *const flashctx)
+static int erase_by_layout(struct flashctx *const flashctx)
 {
 	bool all_skipped = true;
 	const uint32_t flash_size = flashctx->chip->total_size * 1024;
@@ -1370,12 +1370,7 @@ _ret:
 	return ret;
 }
 
-static int erase_by_layout(struct flashctx *const flashctx)
-{
-	return erase_by_layout_new(flashctx);
-}
-
-static int write_by_layout_new(struct flashctx *const flashctx,
+static int write_by_layout(struct flashctx *const flashctx,
 			   void *const curcontents, const void *const newcontents,
 			   bool *all_skipped)
 {
@@ -1410,13 +1405,6 @@ _ret:
 	return ret;
 }
 
-static int write_by_layout(struct flashctx *const flashctx,
-			   uint8_t *const curcontents, const uint8_t *const newcontents,
-			   bool *all_skipped)
-{
-	return write_by_layout_new(flashctx, curcontents, newcontents, all_skipped);
-}
-
 /**
  * @brief Compares the included layout regions with content from a buffer.
  *