diff --git a/core/template.mf b/core/template.mf
deleted file mode 100644
index fcabaea..0000000
--- a/core/template.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ${project.artifactId}
-Bundle-Name: ${project.name}
-Bundle-Vendor: SpringSource, a division of VMware 
-Bundle-Version: ${project.version}
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Template: 
- org.springframework.plugin.core.*;version="${project.version}"
-Import-Template: 
- org.springframework.*;version="${spring.version:[=.=.=.=,+1.0.0)}",
- org.w3c.dom.*;version="0.0.0"
diff --git a/metadata/template.mf b/metadata/template.mf
deleted file mode 100644
index f7126d7..0000000
--- a/metadata/template.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ${project.artifactId}
-Bundle-Name: ${project.name}
-Bundle-Vendor: SpringSource, a division of VMware
-Bundle-Version: ${project.version}
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Template: 
- org.springframework.plugin.metadata.*;version="${project.version}"
-Import-Template: 
- org.springframework.*;version="${spring.version:[=.=.=.=,+1.0.0)}",
- org.springframework.plugin.core.*;version="${project.version:[=.=.=.=,+1.0.0)}"
diff --git a/pom.xml b/pom.xml
index fbe34a0..0453ce2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,24 +147,6 @@
 				</executions>
 			</plugin>
 
-			<plugin>
-				<groupId>com.springsource.bundlor</groupId>
-				<artifactId>com.springsource.bundlor.maven</artifactId>
-				<version>1.0.0.RELEASE</version>
-				<executions>
-					<execution>
-						<id>bundlor</id>
-						<goals>
-							<goal>bundlor</goal>
-						</goals>
-						<phase>process-classes</phase>
-					</execution>
-				</executions>
-				<configuration>
-					<failOnWarnings>true</failOnWarnings>
-				</configuration>
-			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>