diff --git a/include/lib/nonspd_modules.h b/include/lib/nonspd_modules.h
index a9d4b88..8b56667 100644
--- a/include/lib/nonspd_modules.h
+++ b/include/lib/nonspd_modules.h
@@ -14,10 +14,6 @@
 /*
  * Modules defined in lib/spd/nonspd_modules.c
  */
-extern const struct nonspd_mem_info elpida_lpddr3_edfa164a2ma_jd_f;
-extern const struct nonspd_mem_info hynix_ddr3l_h5tc4g63afr_pba;
-extern const struct nonspd_mem_info hynix_ddr3l_h5tc4g63cfr_pba;
-extern const struct nonspd_mem_info hynix_ddr3l_h5tc4g63efr_rda;
 extern const struct nonspd_mem_info hynix_lpddr3_h9ccnnn8gtmlar_nud;
 extern const struct nonspd_mem_info hynix_lpddr3_h9ccnnnbjtalar_nud;
 extern const struct nonspd_mem_info hynix_lpddr4x_h9hcnnnbkmmlxr_nee;
@@ -26,14 +22,9 @@
 extern const struct nonspd_mem_info hynix_lpddr4x_h9hcnnnfammlxr_nee;
 extern const struct nonspd_mem_info hynix_lpddr4x_h54g56cyrbx247;
 extern const struct nonspd_mem_info hynix_lpddr4x_h54g68cyrbx248;
-extern const struct nonspd_mem_info hynix_ddr3l_h5tc8g63amr_pba;
-extern const struct nonspd_mem_info hynix_lpddr3_h9ccnnnbptblbr_nud;
 extern const struct nonspd_mem_info hynix_lpddr3_h9ccnnnbltblar_nud;
-extern const struct nonspd_mem_info hynix_lpddr3_h9ccnnnbktmlbr_ntd;
-extern const struct nonspd_mem_info micron_mt41k256m16ha;
 extern const struct nonspd_mem_info micron_lpddr3_mt52l256m32d1pf_10;
 extern const struct nonspd_mem_info micron_lpddr3_mt52l256m32d1pf_107wtb;
-extern const struct nonspd_mem_info micron_lpddr3_mt52l256m64d2pp_107wtb;
 extern const struct nonspd_mem_info micron_lpddr3_mt52l512m32d2pf_107wtb;
 extern const struct nonspd_mem_info micron_lpddr3_mt52l512m32d2pf_10;
 extern const struct nonspd_mem_info micron_lpddr4x_mt29vzzzad8dqksl;
@@ -47,24 +38,13 @@
 extern const struct nonspd_mem_info micron_lpddr4x_mt53e2g32d4nq_046wta;
 extern const struct nonspd_mem_info micron_lpddr4x_mt53e512m32d2np_046;
 extern const struct nonspd_mem_info micron_lpddr4x_mt53d1g32d4dt_046wtd;
-extern const struct nonspd_mem_info nanya_ddr3l_nt5cc256m16dp_di;
-extern const struct nonspd_mem_info nanya_ddr3l_nt5cc256m16er_ek;
 extern const struct nonspd_mem_info nanya_lpddr3_nt6cl512t32am_h0;
-extern const struct nonspd_mem_info samsung_k4b4g1646d;
-extern const struct nonspd_mem_info samsung_k4b4g1646e;
-extern const struct nonspd_mem_info samsung_k4b4g1646e_byma;
-extern const struct nonspd_mem_info samsung_ddr3l_k4b4g1646d_byk0;
-extern const struct nonspd_mem_info samsung_ddr3l_k4b4g1646q_hyk0;
-extern const struct nonspd_mem_info samsung_ddr3l_k4b8g1646q_myk0;
-extern const struct nonspd_mem_info samsung_lpddr3_k3qf2f20em_agce;
-extern const struct nonspd_mem_info samsung_lpddr3_k4e6e304eb_egce;
 extern const struct nonspd_mem_info samsung_lpddr3_k4e6e304ee_egce;
 extern const struct nonspd_mem_info samsung_lpddr3_k4e6e304eb_egcf;
 extern const struct nonspd_mem_info samsung_lpddr3_k4e6e304ec_egcg;
 extern const struct nonspd_mem_info samsung_lpddr3_k4e8e304ee_egce;
 extern const struct nonspd_mem_info samsung_lpddr3_k4e8e324eb_egcf;
 extern const struct nonspd_mem_info samsung_lpddr3_k4e6e304ed_egcg;
-extern const struct nonspd_mem_info samsung_lpddr4_k3uh5h50mm_agcj;
 extern const struct nonspd_mem_info samsung_lpddr4x_kmdh6001da_b422;
 extern const struct nonspd_mem_info samsung_lpddr4x_kmdp6001da_b425;
 extern const struct nonspd_mem_info samsung_lpddr4x_kmdv6001da_b620;
diff --git a/lib/spd/nonspd_modules.c b/lib/spd/nonspd_modules.c
index f93a198..88eb1ba 100644
--- a/lib/spd/nonspd_modules.c
+++ b/lib/spd/nonspd_modules.c
@@ -7,69 +7,12 @@
 #include "lib/nonspd_modules.h"
 
 /* Common manufacturing IDs */
-#define MFGID_ELPIDA	{ .msb = 0x2c, .lsb = 0x80 }
 #define MFGID_HYNIX	{ .msb = 0xad, .lsb = 0x80 }
 #define MFGID_MICRON	{ .msb = 0x2c, .lsb = 0x00 }
 #define MFGID_NANYA	{ .msb = 0x0b, .lsb = 0x03 }
 #define MFGID_SAMSUNG	{ .msb = 0xce, .lsb = 0x00 }
 #define MFGID_SANDISK	{ .msb = 0x45, .lsb = 0x00 }
 
-const struct nonspd_mem_info elpida_lpddr3_edfa164a2ma_jd_f = {
-	.dram_type		= SPD_DRAM_TYPE_LPDDR3,
-	.module_type.ddr3_type	= DDR3_MODULE_TYPE_UNDEFINED,
-
-	.module_size_mbits	= 8192,
-	.num_ranks		= 2,
-	.device_width		= 32,
-
-	.module_mfg_id		= MFGID_ELPIDA,
-	.dram_mfg_id		= MFGID_ELPIDA,
-
-	.part_num		= "EDFA164A2MA-JD-F",
-};
-
-const struct nonspd_mem_info hynix_ddr3l_h5tc4g63afr_pba = {
-	.dram_type		= SPD_DRAM_TYPE_DDR3,
-	.module_type.ddr3_type	= DDR3_MODULE_TYPE_SO_DIMM,
-
-	.module_size_mbits	= 4096,
-	.num_ranks		= 1,
-	.device_width		= 16,
-
-	.module_mfg_id		= MFGID_HYNIX,
-	.dram_mfg_id		= MFGID_HYNIX,
-
-	.part_num		= "H5TC4G63AFR-PBA",
-};
-
-const struct nonspd_mem_info hynix_ddr3l_h5tc4g63cfr_pba = {
-	.dram_type		= SPD_DRAM_TYPE_DDR3,
-	.module_type.ddr3_type	= DDR3_MODULE_TYPE_SO_DIMM,
-
-	.module_size_mbits	= 4096,
-	.num_ranks		= 1,
-	.device_width		= 16,
-
-	.module_mfg_id		= MFGID_HYNIX,
-	.dram_mfg_id		= MFGID_HYNIX,
-
-	.part_num		= "H5TC4G63CFR-PBA",
-};
-
-const struct nonspd_mem_info hynix_ddr3l_h5tc4g63efr_rda = {
-	.dram_type		= SPD_DRAM_TYPE_DDR3,
-	.module_type.ddr3_type	= DDR3_MODULE_TYPE_UNDEFINED,
-
-	.module_size_mbits	= 4096,
-	.num_ranks		= 1,
-	.device_width		= 16,
-
-	.module_mfg_id		= MFGID_HYNIX,
-	.dram_mfg_id		= MFGID_HYNIX,
-
-	.part_num		= "H5TC4G63EFR-RDA",
-};
-
 const struct nonspd_mem_info hynix_lpddr3_h9ccnnn8gtmlar_nud = {
 	.dram_type		= SPD_DRAM_TYPE_LPDDR3,
 	.module_type.ddr3_type	= DDR3_MODULE_TYPE_SO_DIMM,
@@ -98,33 +41,6 @@
 	.part_num		= "H9CCNNNBJTALAR-NUD",
 };
 
-const struct nonspd_mem_info hynix_ddr3l_h5tc8g63amr_pba = {
-	.dram_type		= SPD_DRAM_TYPE_DDR3,
-	.module_type.ddr3_type	= DDR3_MODULE_TYPE_SO_DIMM,
-	.module_size_mbits	= 8192,
-	.num_ranks		= 2,
-	.device_width		= 16,
-
-	.module_mfg_id		= MFGID_HYNIX,
-	.dram_mfg_id		= MFGID_HYNIX,
-
-	.part_num		= "H5TC8G63AMR-PBA",
-};
-
-const struct nonspd_mem_info hynix_lpddr3_h9ccnnnbptblbr_nud = {
-	.dram_type		= SPD_DRAM_TYPE_LPDDR3,
-	.module_type.ddr3_type	= DDR3_MODULE_TYPE_SO_DIMM,
-
-	.module_size_mbits	= 16384,
-	.num_ranks		= 2,
-	.device_width		= 32,
-
-	.module_mfg_id		= MFGID_HYNIX,
-	.dram_mfg_id		= MFGID_HYNIX,
-
-	.part_num		= "H9CCNNNBPTBLBR-NUD",
-};
-
 const struct nonspd_mem_info hynix_lpddr3_h9ccnnnbltblar_nud = {
 	.dram_type		= SPD_DRAM_TYPE_LPDDR3,
 	.module_type.ddr3_type	= DDR3_MODULE_TYPE_SO_DIMM,
@@ -139,20 +55,6 @@
 	.part_num		= "H9CCNNNBLTBLAR-NUD",
 };
 
-const struct nonspd_mem_info hynix_lpddr3_h9ccnnnbktmlbr_ntd = {
-	.dram_type		= SPD_DRAM_TYPE_LPDDR3,
-	.module_type.ddr3_type	= DDR3_MODULE_TYPE_SO_DIMM,
-
-	.module_size_mbits	= 16384,
-	.num_ranks		= 2,
-	.device_width		= 32,
-
-	.module_mfg_id		= MFGID_HYNIX,
-	.dram_mfg_id		= MFGID_HYNIX,
-
-	.part_num		= "H9CCNNNBKTMLBR-NTD",
-};
-
 const struct nonspd_mem_info hynix_lpddr4x_h9hcnnnbkmmlxr_nee = {
 	.dram_type		= SPD_DRAM_TYPE_LPDDR4X,
 
@@ -231,47 +133,6 @@
 	.part_num               = "H54G68CYRBX248",
 };
 
-const struct nonspd_mem_info micron_mt41k256m16ha = {
-	.dram_type		= SPD_DRAM_TYPE_DDR3,
-	.module_type.ddr3_type	= DDR3_MODULE_TYPE_UNDEFINED,
-
-	.module_size_mbits	= 4096,
-	.num_ranks		= 1,
-	.device_width		= 16,
-
-	.module_mfg_id		= MFGID_MICRON,
-	.dram_mfg_id		= MFGID_MICRON,
-
-	.part_num		= "MT41K256M16HA-125",
-};
-
-const struct nonspd_mem_info nanya_ddr3l_nt5cc256m16dp_di = {
-	.dram_type		= SPD_DRAM_TYPE_DDR3,
-	.module_type.ddr3_type	= DDR3_MODULE_TYPE_UNDEFINED,
-
-	.module_size_mbits	= 4096,
-	.num_ranks		= 1,
-	.device_width		= 16,
-	/* CL = 11, CWL = 8, min = 1.25ns, max <1.5ns */
-	.module_mfg_id		= MFGID_NANYA,
-	.dram_mfg_id		= MFGID_NANYA,
-
-	.part_num		= "NT5CC256M16DP-DI",
-};
-
-const struct nonspd_mem_info nanya_ddr3l_nt5cc256m16er_ek = {
-	.dram_type		= SPD_DRAM_TYPE_DDR3,
-	.module_type.ddr3_type	= DDR3_MODULE_TYPE_UNDEFINED,
-
-	.module_size_mbits	= 4096,
-	.num_ranks		= 1,
-	.device_width		= 16,
-	.module_mfg_id		= MFGID_NANYA,
-	.dram_mfg_id		= MFGID_NANYA,
-
-	.part_num		= "NT5CC256M16ER-EK",
-};
-
 const struct nonspd_mem_info nanya_lpddr3_nt6cl512t32am_h0 = {
 	.dram_type		= SPD_DRAM_TYPE_LPDDR3,
 	.module_type.ddr3_type	= DDR3_MODULE_TYPE_SO_DIMM,
@@ -285,117 +146,6 @@
 	.part_num		= "NT6CL512T32AM-H0",
 };
 
-const struct nonspd_mem_info samsung_k4b4g1646d = {
-	.dram_type		= SPD_DRAM_TYPE_DDR3,
-	.module_type.ddr3_type	= DDR3_MODULE_TYPE_UNDEFINED,
-
-	.module_size_mbits	= 4096,
-	.num_ranks		= 1,
-	.device_width		= 16,
-
-	.module_mfg_id		= MFGID_SAMSUNG,
-	.dram_mfg_id		= MFGID_SAMSUNG,
-
-	.part_num		= "K4B4G1646D-BYK0",
-};
-
-const struct nonspd_mem_info samsung_k4b4g1646e = {
-	.dram_type		= SPD_DRAM_TYPE_DDR3,
-	.module_type.ddr3_type	= DDR3_MODULE_TYPE_UNDEFINED,
-
-	.module_size_mbits	= 4096,
-	.num_ranks		= 1,
-	.device_width		= 16,
-
-	.module_mfg_id		= MFGID_SAMSUNG,
-	.dram_mfg_id		= MFGID_SAMSUNG,
-
-	.part_num		= "K4B4G1646E-BYK0",
-};
-
-const struct nonspd_mem_info samsung_k4b4g1646e_byma = {
-	.dram_type		= SPD_DRAM_TYPE_DDR3,
-	.module_type.ddr3_type	= DDR3_MODULE_TYPE_UNDEFINED,
-
-	.module_size_mbits	= 4096,
-	.num_ranks		= 1,
-	.device_width		= 16,
-
-	.module_mfg_id		= MFGID_SAMSUNG,
-	.dram_mfg_id		= MFGID_SAMSUNG,
-
-	.part_num		= "K4B4G1646E-BYMA",
-};
-
-const struct nonspd_mem_info samsung_ddr3l_k4b4g1646d_byk0 = {
-	.dram_type		= SPD_DRAM_TYPE_DDR3,
-	.module_type.ddr3_type	= DDR3_MODULE_TYPE_SO_DIMM,
-
-	.module_size_mbits	= 4096,
-	.num_ranks		= 1,
-	.device_width		= 16,
-
-	.module_mfg_id		= MFGID_SAMSUNG,
-	.dram_mfg_id		= MFGID_SAMSUNG,
-
-	.part_num		= "K4B4G1646D-BYK0",
-};
-
-const struct nonspd_mem_info samsung_ddr3l_k4b4g1646q_hyk0 = {
-	.dram_type		= SPD_DRAM_TYPE_DDR3,
-	.module_type.ddr3_type	= DDR3_MODULE_TYPE_SO_DIMM,
-
-	.module_size_mbits	= 4096,
-	.num_ranks		= 1,
-	.device_width		= 16,
-
-	.module_mfg_id		= MFGID_SAMSUNG,
-	.dram_mfg_id		= MFGID_SAMSUNG,
-
-	.part_num		= "K4B4G1646Q-HYK0",
-};
-
-const struct nonspd_mem_info samsung_ddr3l_k4b8g1646q_myk0 = {
-	.dram_type		= SPD_DRAM_TYPE_DDR3,
-	.module_type.ddr3_type	= DDR3_MODULE_TYPE_SO_DIMM,
-	.module_size_mbits	= 8192,
-	.num_ranks		= 2,
-	.device_width		= 16,
-
-	.module_mfg_id		= MFGID_SAMSUNG,
-	.dram_mfg_id		= MFGID_SAMSUNG,
-
-	.part_num		= "K4B8G1646Q-MYK0",
-};
-
-const struct nonspd_mem_info samsung_lpddr3_k3qf2f20em_agce = {
-	.dram_type		= SPD_DRAM_TYPE_LPDDR3,
-	.module_type.ddr3_type	= DDR3_MODULE_TYPE_SO_DIMM,
-
-	.module_size_mbits	= 8192,
-	.num_ranks		= 2,
-	.device_width		= 32,
-
-	.module_mfg_id		= MFGID_SAMSUNG,
-	.dram_mfg_id		= MFGID_SAMSUNG,
-
-	.part_num		= "K3QF2F20EM-AGCE",
-};
-
-const struct nonspd_mem_info samsung_lpddr3_k4e6e304eb_egce = {
-	.dram_type		= SPD_DRAM_TYPE_LPDDR3,
-	.module_type.ddr3_type	= DDR3_MODULE_TYPE_SO_DIMM,
-
-	.module_size_mbits	= 16384,
-	.num_ranks		= 2,
-	.device_width		= 32,
-
-	.module_mfg_id		= MFGID_SAMSUNG,
-	.dram_mfg_id		= MFGID_SAMSUNG,
-
-	.part_num		= "K4E6E304EB-EGCE",
-};
-
 const struct nonspd_mem_info samsung_lpddr3_k4e6e304ee_egce = {
 	.dram_type		= SPD_DRAM_TYPE_LPDDR3,
 	.module_type.ddr3_type	= DDR3_MODULE_TYPE_SO_DIMM,
@@ -508,20 +258,6 @@
 	.part_num		= "MT52L256M32D1PF-10",
 };
 
-const struct nonspd_mem_info micron_lpddr3_mt52l256m64d2pp_107wtb = {
-	.dram_type		= SPD_DRAM_TYPE_LPDDR3,
-	.module_type.ddr3_type	= DDR3_MODULE_TYPE_SO_DIMM,
-
-	.module_size_mbits	= 8192,
-	.num_ranks		= 1,
-	.device_width		= 32,
-
-	.module_mfg_id		= MFGID_MICRON,
-	.dram_mfg_id		= MFGID_MICRON,
-
-	.part_num		= "MT52L256M64D2PP-107WT:B",
-};
-
 const struct nonspd_mem_info micron_lpddr3_mt52l512m32d2pf_107wtb = {
 	.dram_type		= SPD_DRAM_TYPE_LPDDR3,
 	.module_type.ddr3_type	= DDR3_MODULE_TYPE_SO_DIMM,
@@ -706,19 +442,6 @@
 	.part_num		= "MT29VZZZCD9GQKPR-046",
 };
 
-const struct nonspd_mem_info samsung_lpddr4_k3uh5h50mm_agcj = {
-	.dram_type		= SPD_DRAM_TYPE_LPDDR4,
-
-	.module_size_mbits	= 32768,
-	.num_ranks		= 2,
-	.device_width		= 32,
-
-	.module_mfg_id		= MFGID_SAMSUNG,
-	.dram_mfg_id		= MFGID_SAMSUNG,
-
-	.part_num		= "K3UH5H50MM-AGCJ",
-};
-
 const struct nonspd_mem_info samsung_lpddr4x_kmdh6001da_b422 = {
 	.dram_type		= SPD_DRAM_TYPE_LPDDR4X,