diff --git a/tools-uclibc/portage.amd64.hardened/env/coreutils.conf b/tools-uclibc/portage.amd64.hardened/env/coreutils.conf
deleted file mode 100644
index a7e6acc4..00000000
--- a/tools-uclibc/portage.amd64.hardened/env/coreutils.conf
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS="-Wl,-liconv"
diff --git a/tools-uclibc/portage.amd64.hardened/package.env b/tools-uclibc/portage.amd64.hardened/package.env
deleted file mode 100644
index 1e67fe8f..00000000
--- a/tools-uclibc/portage.amd64.hardened/package.env
+++ /dev/null
@@ -1 +0,0 @@
-sys-apps/coreutils coreutils.conf
diff --git a/tools-uclibc/portage.amd64.vanilla/env/coreutils.conf b/tools-uclibc/portage.amd64.vanilla/env/coreutils.conf
deleted file mode 100644
index a7e6acc4..00000000
--- a/tools-uclibc/portage.amd64.vanilla/env/coreutils.conf
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS="-Wl,-liconv"
diff --git a/tools-uclibc/portage.amd64.vanilla/package.env b/tools-uclibc/portage.amd64.vanilla/package.env
deleted file mode 100644
index 1e67fe8f..00000000
--- a/tools-uclibc/portage.amd64.vanilla/package.env
+++ /dev/null
@@ -1 +0,0 @@
-sys-apps/coreutils coreutils.conf
diff --git a/tools-uclibc/portage.armv7a.hardened/env/coreutils.conf b/tools-uclibc/portage.armv7a.hardened/env/coreutils.conf
deleted file mode 100644
index a7e6acc4..00000000
--- a/tools-uclibc/portage.armv7a.hardened/env/coreutils.conf
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS="-Wl,-liconv"
diff --git a/tools-uclibc/portage.armv7a.hardened/package.env b/tools-uclibc/portage.armv7a.hardened/package.env
deleted file mode 100644
index 1e67fe8f..00000000
--- a/tools-uclibc/portage.armv7a.hardened/package.env
+++ /dev/null
@@ -1 +0,0 @@
-sys-apps/coreutils coreutils.conf
diff --git a/tools-uclibc/portage.armv7a.vanilla/env/coreutils.conf b/tools-uclibc/portage.armv7a.vanilla/env/coreutils.conf
deleted file mode 100644
index a7e6acc4..00000000
--- a/tools-uclibc/portage.armv7a.vanilla/env/coreutils.conf
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS="-Wl,-liconv"
diff --git a/tools-uclibc/portage.armv7a.vanilla/package.env b/tools-uclibc/portage.armv7a.vanilla/package.env
deleted file mode 100644
index 1e67fe8f..00000000
--- a/tools-uclibc/portage.armv7a.vanilla/package.env
+++ /dev/null
@@ -1 +0,0 @@
-sys-apps/coreutils coreutils.conf
diff --git a/tools-uclibc/portage.i686.hardened/env/coreutils.conf b/tools-uclibc/portage.i686.hardened/env/coreutils.conf
deleted file mode 100644
index a7e6acc4..00000000
--- a/tools-uclibc/portage.i686.hardened/env/coreutils.conf
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS="-Wl,-liconv"
diff --git a/tools-uclibc/portage.i686.hardened/package.env b/tools-uclibc/portage.i686.hardened/package.env
deleted file mode 100644
index 1e67fe8f..00000000
--- a/tools-uclibc/portage.i686.hardened/package.env
+++ /dev/null
@@ -1 +0,0 @@
-sys-apps/coreutils coreutils.conf
diff --git a/tools-uclibc/portage.i686.vanilla/env/coreutils.conf b/tools-uclibc/portage.i686.vanilla/env/coreutils.conf
deleted file mode 100644
index a7e6acc4..00000000
--- a/tools-uclibc/portage.i686.vanilla/env/coreutils.conf
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS="-Wl,-liconv"
diff --git a/tools-uclibc/portage.i686.vanilla/package.env b/tools-uclibc/portage.i686.vanilla/package.env
deleted file mode 100644
index 1e67fe8f..00000000
--- a/tools-uclibc/portage.i686.vanilla/package.env
+++ /dev/null
@@ -1 +0,0 @@
-sys-apps/coreutils coreutils.conf
diff --git a/tools-uclibc/portage.mips32r2.hardened/env/coreutils.conf b/tools-uclibc/portage.mips32r2.hardened/env/coreutils.conf
deleted file mode 100644
index a7e6acc4..00000000
--- a/tools-uclibc/portage.mips32r2.hardened/env/coreutils.conf
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS="-Wl,-liconv"
diff --git a/tools-uclibc/portage.mips32r2.hardened/package.env b/tools-uclibc/portage.mips32r2.hardened/package.env
deleted file mode 100644
index 1e67fe8f..00000000
--- a/tools-uclibc/portage.mips32r2.hardened/package.env
+++ /dev/null
@@ -1 +0,0 @@
-sys-apps/coreutils coreutils.conf
diff --git a/tools-uclibc/portage.mips32r2.vanilla/env/coreutils.conf b/tools-uclibc/portage.mips32r2.vanilla/env/coreutils.conf
deleted file mode 100644
index a7e6acc4..00000000
--- a/tools-uclibc/portage.mips32r2.vanilla/env/coreutils.conf
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS="-Wl,-liconv"
diff --git a/tools-uclibc/portage.mips32r2.vanilla/package.env b/tools-uclibc/portage.mips32r2.vanilla/package.env
deleted file mode 100644
index 1e67fe8f..00000000
--- a/tools-uclibc/portage.mips32r2.vanilla/package.env
+++ /dev/null
@@ -1 +0,0 @@
-sys-apps/coreutils coreutils.conf
diff --git a/tools-uclibc/portage.mipsel3.hardened/env/coreutils.conf b/tools-uclibc/portage.mipsel3.hardened/env/coreutils.conf
deleted file mode 100644
index a7e6acc4..00000000
--- a/tools-uclibc/portage.mipsel3.hardened/env/coreutils.conf
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS="-Wl,-liconv"
diff --git a/tools-uclibc/portage.mipsel3.hardened/package.env b/tools-uclibc/portage.mipsel3.hardened/package.env
deleted file mode 100644
index 1e67fe8f..00000000
--- a/tools-uclibc/portage.mipsel3.hardened/package.env
+++ /dev/null
@@ -1 +0,0 @@
-sys-apps/coreutils coreutils.conf
diff --git a/tools-uclibc/portage.mipsel3.vanilla/env/coreutils.conf b/tools-uclibc/portage.mipsel3.vanilla/env/coreutils.conf
deleted file mode 100644
index a7e6acc4..00000000
--- a/tools-uclibc/portage.mipsel3.vanilla/env/coreutils.conf
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS="-Wl,-liconv"
diff --git a/tools-uclibc/portage.mipsel3.vanilla/package.env b/tools-uclibc/portage.mipsel3.vanilla/package.env
deleted file mode 100644
index 1e67fe8f..00000000
--- a/tools-uclibc/portage.mipsel3.vanilla/package.env
+++ /dev/null
@@ -1 +0,0 @@
-sys-apps/coreutils coreutils.conf
diff --git a/tools-uclibc/portage.ppc.hardened/env/coreutils.conf b/tools-uclibc/portage.ppc.hardened/env/coreutils.conf
deleted file mode 100644
index a7e6acc4..00000000
--- a/tools-uclibc/portage.ppc.hardened/env/coreutils.conf
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS="-Wl,-liconv"
diff --git a/tools-uclibc/portage.ppc.hardened/package.env b/tools-uclibc/portage.ppc.hardened/package.env
deleted file mode 100644
index 1e67fe8f..00000000
--- a/tools-uclibc/portage.ppc.hardened/package.env
+++ /dev/null
@@ -1 +0,0 @@
-sys-apps/coreutils coreutils.conf
diff --git a/tools-uclibc/portage.ppc.vanilla/env/coreutils.conf b/tools-uclibc/portage.ppc.vanilla/env/coreutils.conf
deleted file mode 100644
index a7e6acc4..00000000
--- a/tools-uclibc/portage.ppc.vanilla/env/coreutils.conf
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS="-Wl,-liconv"
diff --git a/tools-uclibc/portage.ppc.vanilla/package.env b/tools-uclibc/portage.ppc.vanilla/package.env
deleted file mode 100644
index 1e67fe8f..00000000
--- a/tools-uclibc/portage.ppc.vanilla/package.env
+++ /dev/null
@@ -1 +0,0 @@
-sys-apps/coreutils coreutils.conf