diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml
index 23375910b9f..8ee1e88db99 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml
@@ -296,84 +296,6 @@
             </product>
           </products>
           <source>repository</source> <!-- To leverage PGP signatures added to repo -->
-          <profileProperties>
-            <pgp.trustedPublicKeys><![CDATA[----BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-UNmHBQdtflW5G1L5fQggWG7V
-=/Asu
------END PGP PUBLIC KEY BLOCK-----
-]]>
-            </pgp.trustedPublicKeys>
-          </profileProperties>
         </configuration>
         <executions>
           <execution>
diff --git a/eclipse.platform.releng/features/org.eclipse.sdk/build.properties b/eclipse.platform.releng/features/org.eclipse.sdk/build.properties
index 99ecc208b81..47f890c1af3 100644
--- a/eclipse.platform.releng/features/org.eclipse.sdk/build.properties
+++ b/eclipse.platform.releng/features/org.eclipse.sdk/build.properties
@@ -11,4 +11,4 @@
 #  Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-bin.includes=feature.xml,feature.properties,p2.inf
+bin.includes=feature.xml,feature.properties
diff --git a/eclipse.platform.releng/features/org.eclipse.sdk/p2.inf b/eclipse.platform.releng/features/org.eclipse.sdk/p2.inf
deleted file mode 100644
index 584ddbc438a..00000000000
--- a/eclipse.platform.releng/features/org.eclipse.sdk/p2.inf
+++ /dev/null
@@ -1,76 +0,0 @@
-# Adds public key for platform-dev-releng@eclipse.org (signed by Eclipse Webmaster) as trusted
-properties.0.name=pgp.trustedPublicKeys
-properties.0.value=-----BEGIN PGP PUBLIC KEY BLOCK-----\n\
-\n\
-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\n\
-UNmHBQdtflW5G1L5fQggWG7V\n\
-=/Asu\n\
------END PGP PUBLIC KEY BLOCK-----\n\