diff --git a/board/nm/nmhw21/board.c b/board/nm/nmhw21/board.c
index 9f7283b521..c177012a8d 100644
--- a/board/nm/nmhw21/board.c
+++ b/board/nm/nmhw21/board.c
@@ -737,12 +737,6 @@ static void get_hw_version(void)
 	bd_get_hw_version(&hw_ver, &hw_rev);
 	bd_get_hw_patch(&hw_patch);
 	printf("MB:    V%d.%d\n", hw_ver, hw_rev);
-
-	/* add hardware versions to environment */
-	/* TODO: Remove ! */
-	snprintf(hw_versions, sizeof(hw_versions), "CP=%d.%d", hw_ver, hw_rev);
-	snprintf(new_env, sizeof(new_env), "setenv bootargs $bootargs %s", hw_versions);
-	setenv("add_version_bootargs", new_env);
 }
 
 static void get_pmic_version(void)