diff --git a/pom.xml b/pom.xml
index f229c1064..e64190f39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -335,7 +335,7 @@
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-jcdi_2.0_spec</artifactId>
 			<version>1.0.1</version>
-			<scope>test</scope>
+			<scope>optional</scope>
 		</dependency>
 
 		<dependency>
diff --git a/src/main/java/org/springframework/data/jpa/convert/threetenbp/package-info.java b/src/main/java/org/springframework/data/jpa/convert/threetenbp/package-info.java
deleted file mode 100644
index be0419148..000000000
--- a/src/main/java/org/springframework/data/jpa/convert/threetenbp/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Spring Data JPA specific ThreeTenBp converters.
- */
-@org.springframework.lang.NonNullApi
-package org.springframework.data.jpa.convert.threetenbp;
diff --git a/src/main/java/org/springframework/data/jpa/repository/utils/package-info.java b/src/main/java/org/springframework/data/jpa/repository/utils/package-info.java
deleted file mode 100644
index a2e33f2ac..000000000
--- a/src/main/java/org/springframework/data/jpa/repository/utils/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * JPA specific utility functions.
- */
-package org.springframework.data.jpa.repository.utils;
-