diff --git a/src/mainboard/asrock/b75pro3-m/acpi_tables.c b/src/mainboard/asrock/b75pro3-m/acpi_tables.c
index 7d634a04ef..114f6e1228 100644
--- a/src/mainboard/asrock/b75pro3-m/acpi_tables.c
+++ b/src/mainboard/asrock/b75pro3-m/acpi_tables.c
@@ -19,14 +19,6 @@
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
-	/* Disable USB ports in S3 by default */
-	gnvs->s3u0 = 0;
-	gnvs->s3u1 = 0;
-
-	/* Disable USB ports in S5 by default */
-	gnvs->s5u0 = 0;
-	gnvs->s5u1 = 0;
-
 	// the lid is open by default.
 	gnvs->lids = 1;
 
diff --git a/src/mainboard/asus/p8h61-m_pro/acpi_tables.c b/src/mainboard/asus/p8h61-m_pro/acpi_tables.c
index 3eadbfb0a2..23537a44d3 100644
--- a/src/mainboard/asus/p8h61-m_pro/acpi_tables.c
+++ b/src/mainboard/asus/p8h61-m_pro/acpi_tables.c
@@ -19,14 +19,6 @@
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
-	/* Disable USB ports in S3 by default */
-	gnvs->s3u0 = 0;
-	gnvs->s3u1 = 0;
-
-	/* Disable USB ports in S5 by default */
-	gnvs->s5u0 = 0;
-	gnvs->s5u1 = 0;
-
 	gnvs->tcrt = 100;
 	gnvs->tpsv = 90;
 }
diff --git a/src/mainboard/asus/p8z77-m_pro/acpi_tables.c b/src/mainboard/asus/p8z77-m_pro/acpi_tables.c
index 2592c19a9e..2d03a99a3c 100644
--- a/src/mainboard/asus/p8z77-m_pro/acpi_tables.c
+++ b/src/mainboard/asus/p8z77-m_pro/acpi_tables.c
@@ -19,14 +19,6 @@
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
-	/* Turn off power for USB ports in S3 by default */
-	gnvs->s3u0 = 0;
-	gnvs->s3u1 = 0;
-
-	/* Turn off power for USB ports in S5 by default */
-	gnvs->s5u0 = 0;
-	gnvs->s5u1 = 0;
-
 	/* critical temp that will shutdown the pc == 95C degrees */
 	gnvs->tcrt = 95;
 
diff --git a/src/mainboard/compulab/intense_pc/acpi_tables.c b/src/mainboard/compulab/intense_pc/acpi_tables.c
index 9d57af17e4..33abf477a6 100644
--- a/src/mainboard/compulab/intense_pc/acpi_tables.c
+++ b/src/mainboard/compulab/intense_pc/acpi_tables.c
@@ -20,14 +20,6 @@
 /* FIXME: check this function.  */
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
-	/* Disable USB ports in S3 by default */
-	gnvs->s3u0 = 0;
-	gnvs->s3u1 = 0;
-
-	/* Disable USB ports in S5 by default */
-	gnvs->s5u0 = 0;
-	gnvs->s5u1 = 0;
-
 	gnvs->tcrt = 100;
 	gnvs->tpsv = 90;
 }
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c b/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c
index 59eb25a40f..441ebc254b 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c
@@ -19,14 +19,6 @@
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
-	/* Disable USB ports in S3 by default */
-	gnvs->s3u0 = 0;
-	gnvs->s3u1 = 0;
-
-	/* Disable USB ports in S5 by default */
-	gnvs->s5u0 = 0;
-	gnvs->s5u1 = 0;
-
 	gnvs->tcrt = CRITICAL_TEMPERATURE;
 	gnvs->tpsv = PASSIVE_TEMPERATURE;
 }
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/acpi_tables.c b/src/mainboard/gigabyte/ga-h61m-s2pv/acpi_tables.c
index 5eb07796c6..b5b4b4065f 100644
--- a/src/mainboard/gigabyte/ga-h61m-s2pv/acpi_tables.c
+++ b/src/mainboard/gigabyte/ga-h61m-s2pv/acpi_tables.c
@@ -17,11 +17,4 @@
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
-	/* Disable USB ports in S3 by default */
-	gnvs->s3u0 = 0;
-	gnvs->s3u1 = 0;
-
-	/* Disable USB ports in S5 by default */
-	gnvs->s5u0 = 0;
-	gnvs->s5u1 = 0;
 }
diff --git a/src/mainboard/hp/2570p/acpi_tables.c b/src/mainboard/hp/2570p/acpi_tables.c
index 7d634a04ef..114f6e1228 100644
--- a/src/mainboard/hp/2570p/acpi_tables.c
+++ b/src/mainboard/hp/2570p/acpi_tables.c
@@ -19,14 +19,6 @@
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
-	/* Disable USB ports in S3 by default */
-	gnvs->s3u0 = 0;
-	gnvs->s3u1 = 0;
-
-	/* Disable USB ports in S5 by default */
-	gnvs->s5u0 = 0;
-	gnvs->s5u1 = 0;
-
 	// the lid is open by default.
 	gnvs->lids = 1;
 
diff --git a/src/mainboard/hp/2760p/acpi_tables.c b/src/mainboard/hp/2760p/acpi_tables.c
index d8d89e40bd..b278512b46 100644
--- a/src/mainboard/hp/2760p/acpi_tables.c
+++ b/src/mainboard/hp/2760p/acpi_tables.c
@@ -17,14 +17,6 @@
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
-	/* Disable USB ports in S3 by default */
-	gnvs->s3u0 = 0;
-	gnvs->s3u1 = 0;
-
-	/* Disable USB ports in S5 by default */
-	gnvs->s5u0 = 0;
-	gnvs->s5u1 = 0;
-
 	// the lid is open by default.
 	gnvs->lids = 1;
 
diff --git a/src/mainboard/hp/8460p/acpi_tables.c b/src/mainboard/hp/8460p/acpi_tables.c
index 7d634a04ef..114f6e1228 100644
--- a/src/mainboard/hp/8460p/acpi_tables.c
+++ b/src/mainboard/hp/8460p/acpi_tables.c
@@ -19,14 +19,6 @@
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
-	/* Disable USB ports in S3 by default */
-	gnvs->s3u0 = 0;
-	gnvs->s3u1 = 0;
-
-	/* Disable USB ports in S5 by default */
-	gnvs->s5u0 = 0;
-	gnvs->s5u1 = 0;
-
 	// the lid is open by default.
 	gnvs->lids = 1;
 
diff --git a/src/mainboard/hp/8470p/acpi_tables.c b/src/mainboard/hp/8470p/acpi_tables.c
index d8d89e40bd..b278512b46 100644
--- a/src/mainboard/hp/8470p/acpi_tables.c
+++ b/src/mainboard/hp/8470p/acpi_tables.c
@@ -17,14 +17,6 @@
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
-	/* Disable USB ports in S3 by default */
-	gnvs->s3u0 = 0;
-	gnvs->s3u1 = 0;
-
-	/* Disable USB ports in S5 by default */
-	gnvs->s5u0 = 0;
-	gnvs->s5u1 = 0;
-
 	// the lid is open by default.
 	gnvs->lids = 1;
 
diff --git a/src/mainboard/hp/8770w/acpi_tables.c b/src/mainboard/hp/8770w/acpi_tables.c
index d8d89e40bd..b278512b46 100644
--- a/src/mainboard/hp/8770w/acpi_tables.c
+++ b/src/mainboard/hp/8770w/acpi_tables.c
@@ -17,14 +17,6 @@
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
-	/* Disable USB ports in S3 by default */
-	gnvs->s3u0 = 0;
-	gnvs->s3u1 = 0;
-
-	/* Disable USB ports in S5 by default */
-	gnvs->s5u0 = 0;
-	gnvs->s5u1 = 0;
-
 	// the lid is open by default.
 	gnvs->lids = 1;
 
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/acpi_tables.c b/src/mainboard/hp/compaq_8200_elite_sff/acpi_tables.c
index 084e7e5a5f..8866557eee 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/acpi_tables.c
+++ b/src/mainboard/hp/compaq_8200_elite_sff/acpi_tables.c
@@ -20,14 +20,6 @@
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
-	/* Disable USB ports in S3 by default */
-	gnvs->s3u0 = 0;
-	gnvs->s3u1 = 0;
-
-	/* Disable USB ports in S5 by default */
-	gnvs->s5u0 = 0;
-	gnvs->s5u1 = 0;
-
 	gnvs->tcrt = 100;
 	gnvs->tpsv = 90;
 }
diff --git a/src/mainboard/hp/folio_9470m/acpi_tables.c b/src/mainboard/hp/folio_9470m/acpi_tables.c
index 7d634a04ef..114f6e1228 100644
--- a/src/mainboard/hp/folio_9470m/acpi_tables.c
+++ b/src/mainboard/hp/folio_9470m/acpi_tables.c
@@ -19,14 +19,6 @@
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
-	/* Disable USB ports in S3 by default */
-	gnvs->s3u0 = 0;
-	gnvs->s3u1 = 0;
-
-	/* Disable USB ports in S5 by default */
-	gnvs->s5u0 = 0;
-	gnvs->s5u1 = 0;
-
 	// the lid is open by default.
 	gnvs->lids = 1;
 
diff --git a/src/mainboard/hp/revolve_810_g1/acpi_tables.c b/src/mainboard/hp/revolve_810_g1/acpi_tables.c
index 6b731ccfc7..4ef3b53792 100644
--- a/src/mainboard/hp/revolve_810_g1/acpi_tables.c
+++ b/src/mainboard/hp/revolve_810_g1/acpi_tables.c
@@ -20,14 +20,6 @@
 /* FIXME: check this function.  */
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
-	/* Disable USB ports in S3 by default */
-	gnvs->s3u0 = 0;
-	gnvs->s3u1 = 0;
-
-	/* Disable USB ports in S5 by default */
-	gnvs->s5u0 = 0;
-	gnvs->s5u1 = 0;
-
 	// the lid is open by default.
 	gnvs->lids = 1;
 
diff --git a/src/mainboard/hp/z220_sff_workstation/acpi_tables.c b/src/mainboard/hp/z220_sff_workstation/acpi_tables.c
index 084e7e5a5f..8866557eee 100644
--- a/src/mainboard/hp/z220_sff_workstation/acpi_tables.c
+++ b/src/mainboard/hp/z220_sff_workstation/acpi_tables.c
@@ -20,14 +20,6 @@
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
-	/* Disable USB ports in S3 by default */
-	gnvs->s3u0 = 0;
-	gnvs->s3u1 = 0;
-
-	/* Disable USB ports in S5 by default */
-	gnvs->s5u0 = 0;
-	gnvs->s5u1 = 0;
-
 	gnvs->tcrt = 100;
 	gnvs->tpsv = 90;
 }
diff --git a/src/mainboard/kontron/ktqm77/acpi_tables.c b/src/mainboard/kontron/ktqm77/acpi_tables.c
index 842e307dcf..b9d951091b 100644
--- a/src/mainboard/kontron/ktqm77/acpi_tables.c
+++ b/src/mainboard/kontron/ktqm77/acpi_tables.c
@@ -18,14 +18,6 @@
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
-	/* Disable USB ports in S3 by default */
-	gnvs->s3u0 = 0;
-	gnvs->s3u1 = 0;
-
-	/* Disable USB ports in S5 by default */
-	gnvs->s5u0 = 0;
-	gnvs->s5u1 = 0;
-
 	gnvs->tcrt = CRITICAL_TEMPERATURE;
 	gnvs->tpsv = PASSIVE_TEMPERATURE;
 }
diff --git a/src/mainboard/msi/ms7707/acpi_tables.c b/src/mainboard/msi/ms7707/acpi_tables.c
index 370b70935f..6727616f4b 100644
--- a/src/mainboard/msi/ms7707/acpi_tables.c
+++ b/src/mainboard/msi/ms7707/acpi_tables.c
@@ -19,14 +19,6 @@
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
-	/* Disable USB ports in S3 by default */
-	gnvs->s3u0 = 0;
-	gnvs->s3u1 = 0;
-
-	/* Disable USB ports in S5 by default */
-	gnvs->s5u0 = 0;
-	gnvs->s5u1 = 0;
-
 	gnvs->tcrt = 100;
 	gnvs->tpsv = 90;
 }
diff --git a/src/mainboard/roda/rv11/acpi_tables.c b/src/mainboard/roda/rv11/acpi_tables.c
index 35d28b5187..8c7d62d2d5 100644
--- a/src/mainboard/roda/rv11/acpi_tables.c
+++ b/src/mainboard/roda/rv11/acpi_tables.c
@@ -19,14 +19,6 @@
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
-	/* Disable USB ports in S3 by default */
-	gnvs->s3u0 = 0;
-	gnvs->s3u1 = 0;
-
-	/* Disable USB ports in S5 by default */
-	gnvs->s5u0 = 0;
-	gnvs->s5u1 = 0;
-
 	/* The lid is open by default */
 	gnvs->lids = 1;
 
diff --git a/src/mainboard/sapphire/pureplatinumh61/acpi_tables.c b/src/mainboard/sapphire/pureplatinumh61/acpi_tables.c
index a790b0bea5..9c08af1ad4 100644
--- a/src/mainboard/sapphire/pureplatinumh61/acpi_tables.c
+++ b/src/mainboard/sapphire/pureplatinumh61/acpi_tables.c
@@ -18,14 +18,6 @@
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
-	/* Disable USB ports in S3 by default */
-	gnvs->s3u0 = 0;
-	gnvs->s3u1 = 0;
-
-	/* Disable USB ports in S5 by default */
-	gnvs->s5u0 = 0;
-	gnvs->s5u1 = 0;
-
 	// the lid is open by default.
 	gnvs->lids = 1;