diff --git a/pom.xml b/pom.xml
index 2695f31..3f91681 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,20 +5,19 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-keyvalue</artifactId>
-	<version>1.2.0.BUILD-SNAPSHOT</version>
+	<version>2.0.0.BUILD-SNAPSHOT</version>
 
 	<name>Spring Data KeyValue</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>
 		<relativePath/>
 	</parent>
 
 	<properties>
-		<dist.key>DATAKV</dist.key>
-		<springdata.commons>1.13.0.BUILD-SNAPSHOT</springdata.commons>
+		<springdata.commons>2.0.0.BUILD-SNAPSHOT</springdata.commons>
 	</properties>
 
 	<dependencies>
diff --git a/template.mf b/template.mf
deleted file mode 100644
index c6d3e04..0000000
--- a/template.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Bundle-SymbolicName: org.springframework.data.keyvalue
-Bundle-Name: ${project.name}
-Bundle-Vendor: Pivotal Software, Inc.
-Bundle-Version: ${project.version}
-Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Template:
- com.querydsl.*;version="${querydsl:[=.=.=,+1.0.0)}";resolution:=optional,
- org.springframework.*;version="${spring:[=.=.=,+1.0.0)}",
- org.springframework.data.*;version="${springdata.commons:[=.=.=,+1.0.0)}"
-DynamicImport-Package: *