diff --git a/pom.xml b/pom.xml
index 19255544a..2418e571d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,18 +5,17 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-commons</artifactId>
-	<version>1.13.0.BUILD-SNAPSHOT</version>
+	<version>2.0.0.BUILD-SNAPSHOT</version>
 
 	<name>Spring Data Core</name>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>1.9.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<properties>
-		<dist.key>DATACMNS</dist.key>
 		<scala>2.11.7</scala>
 		<xmlbeam>1.4.8</xmlbeam>
 	</properties>
diff --git a/template.mf b/template.mf
deleted file mode 100644
index 2d453512e..000000000
--- a/template.mf
+++ /dev/null
@@ -1,45 +0,0 @@
-Bundle-SymbolicName: org.springframework.data.core
-Bundle-Name: ${project.name}
-Bundle-Vendor: Pivotal Software, Inc.
-Bundle-Version: ${project.version}
-Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Excluded-Imports:
- lombok.*
-Import-Package:
- sun.reflect;version="0";resolution:=optional
-Import-Template:
- com.fasterxml.jackson.*;version="${jackson:[=.=.=,+1.0.0)}";resolution:=optional,
- com.google.common.*;version="${guava:[=.=.=,+1.0.0)}";resolution:=optional,
- com.jayway.jsonpath.*;version="${jsonpath:[=.=.=,+1.0.0]}";resolution:=optional,
- com.querydsl.*;version="${querydsl:[=.=.=,+1.0.0)}";resolution:=optional,
- javax.enterprise.*;version="${cdi:[=.=.=,+1.0.0)}";resolution:=optional,
- javax.inject.*;version="[1.0.0,2.0.0)";resolution:=optional,
- javax.servlet.*;version="[2.5.0, 4.0.0)";resolution:=optional,
- javax.xml.bind.*;version="0";resolution:=optional,
- javax.xml.transform.*;version="0";resolution:=optional,
- net.minidev.json.*;version="${jsonpath:[=.=.=,+1.0.0)}";resolution:=optional,
- org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
- org.joda.time.*;version="${jodatime:[=.=.=,+1.0.0)}";resolution:=optional,
- org.springframework.aop.*;version="${spring:[=.=.=,+2.0.0)}";resolution:=optional,
- org.springframework.asm.*;version="${spring:[=.=.=,+2.0.0)}",
- org.springframework.beans.*;version="${spring:[=.=.=,+2.0.0)}",
- org.springframework.core.*;version="${spring:[=.=.=,+2.0.0)}",
- org.springframework.context.*;version="${spring:[=.=.=,+2.0.0)}";resolution:=optional,
- org.springframework.dao.*;version="${spring:[=.=.=,+2.0.0)}";resolution:=optional,
- org.springframework.expression.*;version="${spring:[=.=.=,+2.0.0)}";resolution:=optional,
- org.springframework.format.*;version="${spring:[=.=.=,+2.0.0)}";resolution:=optional,
- org.springframework.hateoas.*;version="${spring-hateoas:[=.=.=,+1.0.0)}";resolution:=optional,
- org.springframework.http.*;version="${spring:[=.=.=,+2.0.0)}";resolution:=optional,
- org.springframework.oxm.*;version="${spring:[=.=.=,+2.0.0)}";resolution:=optional,
- org.springframework.scheduling.*;version="${spring:[=.=.=,+2.0.0)}";resolution:=optional,
- org.springframework.transaction.*;version="${spring:[=.=.=,+2.0.0)}";resolution:=optional,
- org.springframework.util.*;version="${spring:[=.=.=,+2.0.0)}",
- org.springframework.validation.*;version="${spring:[=.=.=,+2.0.0)}";resolution:=optional,
- org.springframework.web.*;version="${spring:[=.=.=,+2.0.0)}";resolution:=optional,
- org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}",
- org.threeten.bp.*;version="${threetenbp:[=.=.=,+1.0.0)}";resolution:=optional,
- org.w3c.dom.*;version="0",
- org.xmlbeam.*;version="${xmlbeam:[=.=.=,+1.0.0)}";resolution:=optional,
- scala.*;version="${scala:[=.=.=,+1.0.0)}";resolution:=optional
-DynamicImport-Package: *