diff --git a/ompi/mpi/java/c/mpi_Constant.c b/ompi/mpi/java/c/mpi_Constant.c
index 23dd738124..e835d8144f 100644
--- a/ompi/mpi/java/c/mpi_Constant.c
+++ b/ompi/mpi/java/c/mpi_Constant.c
@@ -70,12 +70,7 @@ JNIEXPORT void JNICALL Java_mpi_Constant_setConstant(JNIEnv *env, jobject obj)
     ompi_java_setIntField(env, c, obj, "SUBVERSION", MPI_SUBVERSION);
     ompi_java_setIntField(env, c, obj, "ROOT", MPI_ROOT);
     ompi_java_setIntField(env, c, obj, "KEYVAL_INVALID", MPI_KEYVAL_INVALID);
-#ifdef GC_DOES_PINNING
     ompi_java_setIntField(env, c, obj, "BSEND_OVERHEAD", MPI_BSEND_OVERHEAD);
-#else
-    ompi_java_setIntField(env, c, obj, "BSEND_OVERHEAD",
-                          MPI_BSEND_OVERHEAD + sizeof(int));
-#endif  /* GC_DOES_PINNING */
     ompi_java_setIntField(env, c, obj, "MAX_OBJECT_NAME", MPI_MAX_OBJECT_NAME);
     ompi_java_setIntField(env, c, obj, "MAX_PORT_NAME", MPI_MAX_PORT_NAME);
     ompi_java_setIntField(env, c, obj, "MAX_DATAREP_STRING", MPI_MAX_DATAREP_STRING);
diff --git a/ompi/mpi/java/java/Prequest.java b/ompi/mpi/java/java/Prequest.java
index 97911e1f2e..609a16568b 100644
--- a/ompi/mpi/java/java/Prequest.java
+++ b/ompi/mpi/java/java/Prequest.java
@@ -21,18 +21,6 @@
  *            at Syracuse University 1998
  */
 
-
-/*
- * Note: in the end there is no sensible way to use the native
- * persistent requests here.  For every `start'/`wait' cycle you need
- * to do `get...Elements', `release...Elements', otherwise the behaviour
- * is wrong if pinning isn't supported (because then get/release ops
- * need active copying to move values between C and Java).
- *
- * (Even if pinning is supported, the arrays would have to be pinned
- * almost permanently, which presumably isn't a good thing.)
- */
-
 package mpi;
 
 /**