From 776f6144af8d51abcf612b4de6ef295f024149c3 Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Thu, 9 Jan 2014 02:23:20 +0000
Subject: [PATCH] Part 2/companion to r30169: remove Fortran TKR interfaces for
 MPI subroutines with choice buffers.

Refs trac:4065

This commit was SVN r30170.

The following SVN revision numbers were found above:
  r30169 --> open-mpi/ompi@759ee33fd4012117ca2d0313526bb9bb5ade472e

The following Trac tickets were found above:
  Ticket 4065 --> https://svn.open-mpi.org/trac/ompi/ticket/4065
---
 ompi/mpi/fortran/use-mpi-tkr/Makefile.am      |  85 +--------------
 .../fortran/use-mpi-tkr/scripts/Makefile.am   | 102 ------------------
 .../scripts/mpi_accumulate_f90.f90.sh         |  94 ----------------
 .../scripts/mpi_address_f90.f90.sh            |  85 ---------------
 .../scripts/mpi_allgather_f90.f90.sh          |  94 ----------------
 .../scripts/mpi_allgatherv_f90.f90.sh         |  95 ----------------
 .../scripts/mpi_allreduce_f90.f90.sh          |  91 ----------------
 .../scripts/mpi_alltoall_f90.f90.sh           |  94 ----------------
 .../scripts/mpi_alltoallv_f90.f90.sh          |  96 -----------------
 .../scripts/mpi_alltoallw_f90.f90.sh          |  96 -----------------
 .../use-mpi-tkr/scripts/mpi_bcast_f90.f90.sh  |  90 ----------------
 .../use-mpi-tkr/scripts/mpi_bsend_f90.f90.sh  |  91 ----------------
 .../scripts/mpi_bsend_init_f90.f90.sh         |  92 ----------------
 .../scripts/mpi_buffer_attach_f90.f90.sh      |  85 ---------------
 .../scripts/mpi_buffer_detach_f90.f90.sh      |  85 ---------------
 .../use-mpi-tkr/scripts/mpi_exscan_f90.f90.sh |  91 ----------------
 .../scripts/mpi_file_iread_at_f90.f90.sh      |  91 ----------------
 .../scripts/mpi_file_iread_f90.f90.sh         |  90 ----------------
 .../scripts/mpi_file_iread_shared_f90.f90.sh  |  90 ----------------
 .../scripts/mpi_file_iwrite_at_f90.f90.sh     |  91 ----------------
 .../scripts/mpi_file_iwrite_f90.f90.sh        |  90 ----------------
 .../scripts/mpi_file_iwrite_shared_f90.f90.sh |  90 ----------------
 .../mpi_file_read_all_begin_f90.f90.sh        |  87 ---------------
 .../scripts/mpi_file_read_all_end_f90.f90.sh  |  86 ---------------
 .../scripts/mpi_file_read_all_f90.f90.sh      |  90 ----------------
 .../mpi_file_read_at_all_begin_f90.f90.sh     |  90 ----------------
 .../mpi_file_read_at_all_end_f90.f90.sh       |  86 ---------------
 .../scripts/mpi_file_read_at_all_f90.f90.sh   |  91 ----------------
 .../scripts/mpi_file_read_at_f90.f90.sh       |  91 ----------------
 .../scripts/mpi_file_read_f90.f90.sh          |  90 ----------------
 .../mpi_file_read_ordered_begin_f90.f90.sh    |  87 ---------------
 .../mpi_file_read_ordered_end_f90.f90.sh      |  86 ---------------
 .../scripts/mpi_file_read_ordered_f90.f90.sh  |  90 ----------------
 .../scripts/mpi_file_read_shared_f90.f90.sh   |  90 ----------------
 .../mpi_file_write_all_begin_f90.f90.sh       |  87 ---------------
 .../scripts/mpi_file_write_all_end_f90.f90.sh |  86 ---------------
 .../scripts/mpi_file_write_all_f90.f90.sh     |  90 ----------------
 .../mpi_file_write_at_all_begin_f90.f90.sh    |  90 ----------------
 .../mpi_file_write_at_all_end_f90.f90.sh      |  86 ---------------
 .../scripts/mpi_file_write_at_all_f90.f90.sh  |  91 ----------------
 .../scripts/mpi_file_write_at_f90.f90.sh      |  91 ----------------
 .../scripts/mpi_file_write_f90.f90.sh         |  90 ----------------
 .../mpi_file_write_ordered_begin_f90.f90.sh   |  87 ---------------
 .../mpi_file_write_ordered_end_f90.f90.sh     |  86 ---------------
 .../scripts/mpi_file_write_ordered_f90.f90.sh |  90 ----------------
 .../scripts/mpi_file_write_shared_f90.f90.sh  |  90 ----------------
 .../scripts/mpi_free_mem_f90.f90.sh           |  82 --------------
 .../use-mpi-tkr/scripts/mpi_gather_f90.f90.sh |  93 ----------------
 .../scripts/mpi_gatherv_f90.f90.sh            |  94 ----------------
 .../scripts/mpi_get_address_f90.f90.sh        |  85 ---------------
 .../use-mpi-tkr/scripts/mpi_get_f90.f90.sh    |  93 ----------------
 .../scripts/mpi_iallgather_f90.f90.sh         |  93 ----------------
 .../scripts/mpi_iallgatherv_f90.f90.sh        |  94 ----------------
 .../scripts/mpi_iallreduce_f90.f90.sh         |  92 ----------------
 .../scripts/mpi_ialltoall_f90.f90.sh          |  93 ----------------
 .../scripts/mpi_ialltoallv_f90.f90.sh         |  95 ----------------
 .../scripts/mpi_ialltoallw_f90.f90.sh         |  95 ----------------
 .../use-mpi-tkr/scripts/mpi_ibcast_f90.f90.sh |  91 ----------------
 .../use-mpi-tkr/scripts/mpi_ibsend_f90.f90.sh |  92 ----------------
 .../scripts/mpi_iexscan_f90.f90.sh            |  92 ----------------
 .../scripts/mpi_igather_f90.f90.sh            |  94 ----------------
 .../scripts/mpi_igatherv_f90.f90.sh           |  95 ----------------
 .../use-mpi-tkr/scripts/mpi_imrecv_f90.f90.sh |  88 ---------------
 .../mpi_ineighbor_allgather_f90.f90.sh        |  95 ----------------
 .../mpi_ineighbor_allgatherv_f90.f90.sh       |  96 -----------------
 .../scripts/mpi_ineighbor_alltoall_f90.f90.sh |  95 ----------------
 .../mpi_ineighbor_alltoallv_f90.f90.sh        |  97 -----------------
 .../mpi_ineighbor_alltoallw_f90.f90.sh        |  95 ----------------
 .../use-mpi-tkr/scripts/mpi_irecv_f90.f90.sh  |  92 ----------------
 .../scripts/mpi_ireduce_f90.f90.sh            |  93 ----------------
 .../mpi_ireduce_scatter_block_f90.f90.sh      |  92 ----------------
 .../scripts/mpi_ireduce_scatter_f90.f90.sh    |  92 ----------------
 .../use-mpi-tkr/scripts/mpi_irsend_f90.f90.sh |  92 ----------------
 .../use-mpi-tkr/scripts/mpi_iscan_f90.f90.sh  |  92 ----------------
 .../scripts/mpi_iscatter_f90.f90.sh           |  94 ----------------
 .../scripts/mpi_iscatterv_f90.f90.sh          |  95 ----------------
 .../use-mpi-tkr/scripts/mpi_isend_f90.f90.sh  |  92 ----------------
 .../use-mpi-tkr/scripts/mpi_issend_f90.f90.sh |  92 ----------------
 .../use-mpi-tkr/scripts/mpi_mrecv_f90.f90.sh  |  88 ---------------
 .../scripts/mpi_neighbor_allgather_f90.f90.sh |  94 ----------------
 .../mpi_neighbor_allgatherv_f90.f90.sh        |  95 ----------------
 .../scripts/mpi_neighbor_alltoall_f90.f90.sh  |  94 ----------------
 .../scripts/mpi_neighbor_alltoallv_f90.f90.sh |  96 -----------------
 .../scripts/mpi_neighbor_alltoallw_f90.f90.sh |  96 -----------------
 .../scripts/mpi_pack_external_f90.f90.sh      |  92 ----------------
 .../use-mpi-tkr/scripts/mpi_pack_f90.f90.sh   |  92 ----------------
 .../use-mpi-tkr/scripts/mpi_put_f90.f90.sh    |  93 ----------------
 .../use-mpi-tkr/scripts/mpi_recv_f90.f90.sh   |  92 ----------------
 .../scripts/mpi_recv_init_f90.f90.sh          |  92 ----------------
 .../use-mpi-tkr/scripts/mpi_reduce_f90.f90.sh |  92 ----------------
 .../mpi_reduce_scatter_block_f90.f90.sh       |  91 ----------------
 .../scripts/mpi_reduce_scatter_f90.f90.sh     |  91 ----------------
 .../use-mpi-tkr/scripts/mpi_rsend_f90.f90.sh  |  91 ----------------
 .../scripts/mpi_rsend_init_f90.f90.sh         |  92 ----------------
 .../use-mpi-tkr/scripts/mpi_scan_f90.f90.sh   |  91 ----------------
 .../scripts/mpi_scatter_f90.f90.sh            |  93 ----------------
 .../scripts/mpi_scatterv_f90.f90.sh           |  94 ----------------
 .../use-mpi-tkr/scripts/mpi_send_f90.f90.sh   |  91 ----------------
 .../scripts/mpi_send_init_f90.f90.sh          |  92 ----------------
 .../scripts/mpi_sendrecv_f90.f90.sh           |  97 -----------------
 .../scripts/mpi_sendrecv_replace_f90.f90.sh   |  94 ----------------
 .../use-mpi-tkr/scripts/mpi_ssend_f90.f90.sh  |  91 ----------------
 .../scripts/mpi_ssend_init_f90.f90.sh         |  92 ----------------
 .../scripts/mpi_win_create_f90.f90.sh         |  91 ----------------
 104 files changed, 5 insertions(+), 9503 deletions(-)
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_accumulate_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_address_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_allgather_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_allgatherv_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_allreduce_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_alltoall_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_alltoallv_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_alltoallw_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_bcast_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_bsend_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_bsend_init_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_buffer_attach_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_buffer_detach_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_exscan_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iread_at_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iread_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iread_shared_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iwrite_at_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iwrite_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iwrite_shared_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_all_begin_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_all_end_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_all_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_at_all_begin_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_at_all_end_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_at_all_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_at_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_ordered_begin_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_ordered_end_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_ordered_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_shared_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_all_begin_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_all_end_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_all_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_at_all_begin_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_at_all_end_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_at_all_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_at_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_ordered_begin_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_ordered_end_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_ordered_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_shared_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_free_mem_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_gather_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_gatherv_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_get_address_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_get_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iallgather_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iallgatherv_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iallreduce_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ialltoall_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ialltoallv_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ialltoallw_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ibcast_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ibsend_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iexscan_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_igather_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_igatherv_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_imrecv_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ineighbor_allgather_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ineighbor_allgatherv_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ineighbor_alltoall_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ineighbor_alltoallv_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ineighbor_alltoallw_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_irecv_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ireduce_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ireduce_scatter_block_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ireduce_scatter_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_irsend_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iscan_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iscatter_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iscatterv_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_isend_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_issend_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_mrecv_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_neighbor_allgather_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_neighbor_allgatherv_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_neighbor_alltoall_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_neighbor_alltoallv_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_neighbor_alltoallw_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_pack_external_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_pack_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_put_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_recv_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_recv_init_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_reduce_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_reduce_scatter_block_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_reduce_scatter_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_rsend_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_rsend_init_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_scan_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_scatter_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_scatterv_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_send_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_send_init_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_sendrecv_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_sendrecv_replace_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ssend_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ssend_init_f90.f90.sh
 delete mode 100755 ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_win_create_f90.f90.sh

diff --git a/ompi/mpi/fortran/use-mpi-tkr/Makefile.am b/ompi/mpi/fortran/use-mpi-tkr/Makefile.am
index 09c4d887e0..da8e9419f6 100644
--- a/ompi/mpi/fortran/use-mpi-tkr/Makefile.am
+++ b/ompi/mpi/fortran/use-mpi-tkr/Makefile.am
@@ -160,10 +160,12 @@ libmpi_usempi_la_LIBADD = \
 
 # These files are all generated by scripts in the scripts/ directory.
 
-trivial_sources = \
-     mpi_sizeof.f90 
+# Per MPI-3 p610:34-41, if we're building a TKR mpi module, we should
+# not build any interfaces for MPI subroutines that take a choice
+# buffer dummy argument.
 
-small_sources = \
+nodist_libmpi_usempi_la_SOURCES = \
+     mpi_sizeof.f90 \
      mpi_comm_spawn_multiple_f90.f90 \
      mpi_testall_f90.f90 \
      mpi_testsome_f90.f90 \
@@ -172,83 +174,6 @@ small_sources = \
      mpi_wtick_f90.f90 \
      mpi_wtime_f90.f90
 
-# Per the MPI-3 p610 comment below, these files are never compiled
-# (and therefore the corresponding scripts/ scripts for them are never
-# invoked).  They should probably be deleted someday.  They're only
-# left here in case we decide to put a ./configure CLI option to
-# enable them.
-medium_sources = \
-     mpi_address_f90.f90 \
-     mpi_accumulate_f90.f90 \
-     mpi_bcast_f90.f90 \
-     mpi_bsend_f90.f90 \
-     mpi_bsend_init_f90.f90 \
-     mpi_buffer_attach_f90.f90 \
-     mpi_buffer_detach_f90.f90 \
-     mpi_get_f90.f90 \
-     mpi_get_address_f90.f90 \
-     mpi_ibcast_f90.f90 \
-     mpi_ibsend_f90.f90 \
-     mpi_imrecv_f90.f90 \
-     mpi_irecv_f90.f90 \
-     mpi_irsend_f90.f90 \
-     mpi_isend_f90.f90 \
-     mpi_issend_f90.f90 \
-     mpi_free_mem_f90.f90 \
-     mpi_mrecv_f90.f90 \
-     mpi_put_f90.f90 \
-     mpi_recv_f90.f90 \
-     mpi_recv_init_f90.f90 \
-     mpi_rsend_f90.f90 \
-     mpi_rsend_init_f90.f90 \
-     mpi_send_f90.f90 \
-     mpi_send_init_f90.f90 \
-     mpi_sendrecv_replace_f90.f90 \
-     mpi_ssend_f90.f90 \
-     mpi_ssend_init_f90.f90 \
-     mpi_win_create_f90.f90
-
-if OMPI_PROVIDE_MPI_FILE_INTERFACE
-medium_sources += \
-     mpi_file_iread_f90.f90 \
-     mpi_file_iread_at_f90.f90 \
-     mpi_file_iread_shared_f90.f90 \
-     mpi_file_iwrite_f90.f90 \
-     mpi_file_iwrite_at_f90.f90 \
-     mpi_file_iwrite_shared_f90.f90 \
-     mpi_file_read_f90.f90 \
-     mpi_file_read_all_f90.f90 \
-     mpi_file_read_all_begin_f90.f90 \
-     mpi_file_read_all_end_f90.f90 \
-     mpi_file_read_at_f90.f90 \
-     mpi_file_read_at_all_f90.f90 \
-     mpi_file_read_at_all_begin_f90.f90 \
-     mpi_file_read_at_all_end_f90.f90 \
-     mpi_file_read_ordered_f90.f90 \
-     mpi_file_read_ordered_begin_f90.f90 \
-     mpi_file_read_ordered_end_f90.f90 \
-     mpi_file_read_shared_f90.f90 \
-     mpi_file_write_f90.f90 \
-     mpi_file_write_all_f90.f90 \
-     mpi_file_write_all_begin_f90.f90 \
-     mpi_file_write_all_end_f90.f90 \
-     mpi_file_write_at_f90.f90 \
-     mpi_file_write_at_all_f90.f90 \
-     mpi_file_write_at_all_begin_f90.f90 \
-     mpi_file_write_at_all_end_f90.f90 \
-     mpi_file_write_ordered_f90.f90 \
-     mpi_file_write_ordered_begin_f90.f90 \
-     mpi_file_write_ordered_end_f90.f90 \
-     mpi_file_write_shared_f90.f90
-endif
-
-# Per MPI-3 p610:34-41, if we're building a TKR mpi module, we should
-# not build the "medium" interfaces (i.e., MPI subroutines with choice
-# buffers).  See comment in fortran_kinds.sh.in for more detail.
-nodist_libmpi_usempi_la_SOURCES = \
-     $(trivial_sources) \
-     $(small_sources)
-
 # Set the library version
 libmpi_usempi_la_LDFLAGS = \
         -version-info $(libmpi_usempi_tkr_so_version) \
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/Makefile.am b/ompi/mpi/fortran/use-mpi-tkr/scripts/Makefile.am
index 3d13dd4c55..cb8022092b 100644
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/Makefile.am
+++ b/ompi/mpi/fortran/use-mpi-tkr/scripts/Makefile.am
@@ -20,116 +20,14 @@
 
 fortran_scripts = \
      mpi-f90-interfaces.h.sh \
-     mpi_accumulate_f90.f90.sh \
-     mpi_address_f90.f90.sh \
-     mpi_allgather_f90.f90.sh \
-     mpi_allgatherv_f90.f90.sh \
-     mpi_allreduce_f90.f90.sh \
-     mpi_alltoall_f90.f90.sh \
-     mpi_alltoallv_f90.f90.sh \
-     mpi_alltoallw_f90.f90.sh \
-     mpi_bcast_f90.f90.sh \
-     mpi_bsend_f90.f90.sh \
-     mpi_bsend_init_f90.f90.sh \
-     mpi_buffer_attach_f90.f90.sh \
-     mpi_buffer_detach_f90.f90.sh \
      mpi_comm_spawn_multiple_f90.f90.sh \
-     mpi_exscan_f90.f90.sh \
-     mpi_file_iread_at_f90.f90.sh \
-     mpi_file_iread_f90.f90.sh \
-     mpi_file_iread_shared_f90.f90.sh \
-     mpi_file_iwrite_at_f90.f90.sh \
-     mpi_file_iwrite_f90.f90.sh \
-     mpi_file_iwrite_shared_f90.f90.sh \
-     mpi_file_read_all_begin_f90.f90.sh \
-     mpi_file_read_all_end_f90.f90.sh \
-     mpi_file_read_all_f90.f90.sh \
-     mpi_file_read_at_all_begin_f90.f90.sh \
-     mpi_file_read_at_all_end_f90.f90.sh \
-     mpi_file_read_at_all_f90.f90.sh \
-     mpi_file_read_at_f90.f90.sh \
-     mpi_file_read_f90.f90.sh \
-     mpi_file_read_ordered_begin_f90.f90.sh \
-     mpi_file_read_ordered_end_f90.f90.sh \
-     mpi_file_read_ordered_f90.f90.sh \
-     mpi_file_read_shared_f90.f90.sh \
-     mpi_file_write_all_begin_f90.f90.sh \
-     mpi_file_write_all_end_f90.f90.sh \
-     mpi_file_write_all_f90.f90.sh \
-     mpi_file_write_at_all_begin_f90.f90.sh \
-     mpi_file_write_at_all_end_f90.f90.sh \
-     mpi_file_write_at_all_f90.f90.sh \
-     mpi_file_write_at_f90.f90.sh \
-     mpi_file_write_f90.f90.sh \
-     mpi_file_write_ordered_begin_f90.f90.sh \
-     mpi_file_write_ordered_end_f90.f90.sh \
-     mpi_file_write_ordered_f90.f90.sh \
-     mpi_file_write_shared_f90.f90.sh \
-     mpi_free_mem_f90.f90.sh \
-     mpi_gather_f90.f90.sh \
-     mpi_gatherv_f90.f90.sh \
-     mpi_get_f90.f90.sh \
-     mpi_get_address_f90.f90.sh \
-     mpi_iallgather_f90.f90.sh \
-     mpi_iallgatherv_f90.f90.sh \
-     mpi_iallreduce_f90.f90.sh \
-     mpi_ialltoall_f90.f90.sh \
-     mpi_ialltoallv_f90.f90.sh \
-     mpi_ialltoallw_f90.f90.sh \
-     mpi_ibcast_f90.f90.sh \
-     mpi_ibsend_f90.f90.sh \
-     mpi_iexscan_f90.f90.sh \
-     mpi_imrecv_f90.f90.sh \
-     mpi_ineighbor_allgather_f90.f90.sh \
-     mpi_ineighbor_allgatherv_f90.f90.sh \
-     mpi_ineighbor_alltoall_f90.f90.sh \
-     mpi_ineighbor_alltoallv_f90.f90.sh \
-     mpi_ineighbor_alltoallw_f90.f90.sh \
-     mpi_igather_f90.f90.sh \
-     mpi_igatherv_f90.f90.sh \
-     mpi_irecv_f90.f90.sh \
-     mpi_ireduce_f90.f90.sh \
-     mpi_ireduce_scatter_f90.f90.sh \
-     mpi_ireduce_scatter_block_f90.f90.sh \
-     mpi_irsend_f90.f90.sh \
-     mpi_iscan_f90.f90.sh \
-     mpi_iscatter_f90.f90.sh \
-     mpi_iscatterv_f90.f90.sh \
-     mpi_isend_f90.f90.sh \
-     mpi_issend_f90.f90.sh \
-     mpi_mrecv_f90.f90.sh \
-     mpi_neighbor_allgather_f90.f90.sh \
-     mpi_neighbor_allgatherv_f90.f90.sh \
-     mpi_neighbor_alltoall_f90.f90.sh \
-     mpi_neighbor_alltoallv_f90.f90.sh \
-     mpi_neighbor_alltoallw_f90.f90.sh \
-     mpi_pack_external_f90.f90.sh \
-     mpi_pack_f90.f90.sh \
-     mpi_put_f90.f90.sh \
-     mpi_recv_f90.f90.sh \
-     mpi_recv_init_f90.f90.sh \
-     mpi_reduce_f90.f90.sh \
-     mpi_reduce_scatter_f90.f90.sh \
-     mpi_reduce_scatter_block_f90.f90.sh \
-     mpi_rsend_f90.f90.sh \
-     mpi_rsend_init_f90.f90.sh \
-     mpi_scan_f90.f90.sh \
-     mpi_scatter_f90.f90.sh \
-     mpi_scatterv_f90.f90.sh \
-     mpi_send_f90.f90.sh \
-     mpi_send_init_f90.f90.sh \
-     mpi_sendrecv_f90.f90.sh \
-     mpi_sendrecv_replace_f90.f90.sh \
      mpi_sizeof.f90.sh \
-     mpi_ssend_f90.f90.sh \
-     mpi_ssend_init_f90.f90.sh \
      mpi_testall_f90.f90.sh \
      mpi_testsome_f90.f90.sh \
      mpi_unpack_external_f90.f90.sh \
      mpi_unpack_f90.f90.sh \
      mpi_waitall_f90.f90.sh \
      mpi_waitsome_f90.f90.sh \
-     mpi_win_create_f90.f90.sh \
      mpi_wtick_f90.f90.sh \
      mpi_wtime_f90.f90.sh
 
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_accumulate_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_accumulate_f90.f90.sh
deleted file mode 100755
index 1701c160ce..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_accumulate_f90.f90.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(origin_addr, origin_count, origin_datatype, target_rank, target_disp, &
-        target_count, target_datatype, op, win, ierror)
-  include "mpif-config.h"
-  ${type} :: origin_addr
-  integer, intent(in) :: origin_count
-  integer, intent(in) :: origin_datatype
-  integer, intent(in) :: target_rank
-  integer(kind=MPI_ADDRESS_KIND), intent(in) :: target_disp
-  integer, intent(in) :: target_count
-  integer, intent(in) :: target_datatype
-  integer, intent(in) :: op
-  integer, intent(in) :: win
-  integer, intent(out) :: ierror
-  call ${procedure}(origin_addr, origin_count, origin_datatype, target_rank, target_disp, &
-        target_count, target_datatype, op, win, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Accumulate ${rank} CH "character${dim}"
-  output MPI_Accumulate ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Accumulate ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Accumulate ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Accumulate ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_address_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_address_f90.f90.sh
deleted file mode 100755
index 0111043653..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_address_f90.f90.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(location, address, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: location
-  integer, intent(out) :: address
-  integer, intent(out) :: ierror
-  call ${procedure}(location, address, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Address ${rank} CH "character${dim}"
-  output MPI_Address ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Address ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Address ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Address ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_allgather_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_allgather_f90.f90.sh
deleted file mode 100755
index 1e4db9a962..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_allgather_f90.f90.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2013      Los Alamos National Security, LLC. All rights
-#                         reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, intent(in) :: sendcount
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, intent(in) :: recvcount
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Neighbor_allgather ${rank} CH "character${dim}"
-  output MPI_Neighbor_allgather ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Neighbor_allgather ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Neighbor_allgather ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Neighbor_allgather ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_allgatherv_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_allgatherv_f90.f90.sh
deleted file mode 100755
index ea06b911fe..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_allgatherv_f90.f90.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2013      Los Alamos National Security, LLC. All rights
-#                         reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcount, sendtype, recvbuf, recvcounts, &
-        displs, recvtype, comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, intent(in) :: sendcount
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, dimension(*), intent(in) :: recvcounts
-  integer, dimension(*), intent(in) :: displs
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcount, sendtype, recvbuf, recvcounts, &
-        displs, recvtype, comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Neighbor_allgatherv ${rank} CH "character${dim}"
-  output MPI_Neighbor_allgatherv ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Neighbor_allgatherv ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Neighbor_allgatherv ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Neighbor_allgatherv ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_allreduce_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_allreduce_f90.f90.sh
deleted file mode 100755
index 42c6c33234..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_allreduce_f90.f90.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, recvbuf, count, datatype, op, &
-        comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  ${type} :: recvbuf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: op
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, recvbuf, count, datatype, op, &
-        comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Allreduce ${rank} CH "character${dim}"
-  output MPI_Allreduce ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Allreduce ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Allreduce ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Allreduce ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_alltoall_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_alltoall_f90.f90.sh
deleted file mode 100755
index 93fc191498..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_alltoall_f90.f90.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2013      Los Alamos National Security, LLC. All rights
-#                         reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, intent(in) :: sendcount
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, intent(in) :: recvcount
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Alltoall ${rank} CH "character${dim}"
-  output MPI_Alltoall ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Alltoall ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Alltoall ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Alltoall ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_alltoallv_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_alltoallv_f90.f90.sh
deleted file mode 100755
index ab17c84d74..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_alltoallv_f90.f90.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2013      Los Alamos National Security, LLC. All rights
-#                         reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcounts, sdispls, sendtype, recvbuf, &
-        recvcounts, rdispls, recvtype, comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, dimension(*), intent(in) :: sendcounts
-  integer, dimension(*), intent(in) :: sdispls
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, dimension(*), intent(in) :: recvcounts
-  integer, dimension(*), intent(in) :: rdispls
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcounts, sdispls, sendtype, recvbuf, &
-        recvcounts, rdispls, recvtype, comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Alltoallv ${rank} CH "character${dim}"
-  output MPI_Alltoallv ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Alltoallv ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Alltoallv ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Alltoallv ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_alltoallw_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_alltoallw_f90.f90.sh
deleted file mode 100755
index b091434d2f..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_alltoallw_f90.f90.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2013      Los Alamos National Security, LLC. All rights
-#                         reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, &
-        recvcounts, rdispls, recvtypes, comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, dimension(*), intent(in) :: sendcounts
-  integer(kind=MPI_ADDRESS_KIND), intent(in) :: sdispls
-  integer, dimension(*), intent(in) :: sendtypes
-  ${type} :: recvbuf
-  integer, dimension(*), intent(in) :: recvcounts
-  integer(kind=MPI_ADDRESS_KIND), intent(in) :: rdispls
-  integer, dimension(*), intent(in) :: recvtypes
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, &
-        recvcounts, rdispls, recvtypes, comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Alltoallw ${rank} CH "character${dim}"
-  output MPI_Alltoallw ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Alltoallw ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Alltoallw ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Alltoallw ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_bcast_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_bcast_f90.f90.sh
deleted file mode 100755
index 929e89254c..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_bcast_f90.f90.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2012      FUJITSU LIMITED.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(buffer, count, datatype, root, comm&
-        , ierror)
-  include "mpif-config.h"
-  ${type} :: buffer
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: root
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(buffer, count, datatype, root, comm&
-        , ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Bcast ${rank} CH "character${dim}"
-  output MPI_Bcast ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Bcast ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Bcast ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Bcast ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_bsend_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_bsend_f90.f90.sh
deleted file mode 100755
index 20bf8ba52a..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_bsend_f90.f90.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(buf, count, datatype, dest, tag, &
-        comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: dest
-  integer, intent(in) :: tag
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(buf, count, datatype, dest, tag, &
-        comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Bsend ${rank} CH "character${dim}"
-  output MPI_Bsend ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Bsend ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Bsend ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Bsend ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_bsend_init_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_bsend_init_f90.f90.sh
deleted file mode 100755
index 44a27e2c1e..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_bsend_init_f90.f90.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(buf, count, datatype, dest, tag, &
-        comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: dest
-  integer, intent(in) :: tag
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(buf, count, datatype, dest, tag, &
-        comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Bsend_init ${rank} CH "character${dim}"
-  output MPI_Bsend_init ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Bsend_init ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Bsend_init ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Bsend_init ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_buffer_attach_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_buffer_attach_f90.f90.sh
deleted file mode 100755
index 35ce503947..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_buffer_attach_f90.f90.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(buffer, size, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: buffer
-  integer, intent(in) :: size
-  integer, intent(out) :: ierror
-  call ${procedure}(buffer, size, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Buffer_attach ${rank} CH "character${dim}"
-  output MPI_Buffer_attach ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Buffer_attach ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Buffer_attach ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Buffer_attach ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_buffer_detach_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_buffer_detach_f90.f90.sh
deleted file mode 100755
index 56ad5db959..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_buffer_detach_f90.f90.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(buffer, size, ierror)
-  include "mpif-config.h"
-  ${type}, intent(out) :: buffer
-  integer, intent(out) :: size
-  integer, intent(out) :: ierror
-  call ${procedure}(buffer, size, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Buffer_detach ${rank} CH "character${dim}"
-  output MPI_Buffer_detach ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Buffer_detach ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Buffer_detach ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Buffer_detach ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_exscan_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_exscan_f90.f90.sh
deleted file mode 100755
index 3f3598231d..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_exscan_f90.f90.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, recvbuf, count, datatype, op, &
-        comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  ${type} :: recvbuf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: op
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, recvbuf, count, datatype, op, &
-        comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Exscan ${rank} CH "character${dim}"
-  output MPI_Exscan ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Exscan ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Exscan ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Exscan ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iread_at_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iread_at_f90.f90.sh
deleted file mode 100755
index ad83f0984b..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iread_at_f90.f90.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, offset, buf, count, datatype, &
-        request, ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  integer(kind=MPI_OFFSET_KIND), intent(in) :: offset
-  ${type} :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, offset, buf, count, datatype, &
-        request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_iread_at ${rank} CH "character${dim}"
-  output MPI_File_iread_at ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_iread_at ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_iread_at ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_iread_at ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iread_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iread_f90.f90.sh
deleted file mode 100755
index 8bd5de1f73..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iread_f90.f90.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, buf, count, datatype, request&
-        , ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  ${type} :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, buf, count, datatype, request&
-        , ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_iread ${rank} CH "character${dim}"
-  output MPI_File_iread ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_iread ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_iread ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_iread ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iread_shared_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iread_shared_f90.f90.sh
deleted file mode 100755
index 30c8a0dadb..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iread_shared_f90.f90.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, buf, count, datatype, request&
-        , ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  ${type} :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, buf, count, datatype, request&
-        , ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_iread_shared ${rank} CH "character${dim}"
-  output MPI_File_iread_shared ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_iread_shared ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_iread_shared ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_iread_shared ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iwrite_at_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iwrite_at_f90.f90.sh
deleted file mode 100755
index f185f6ffb8..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iwrite_at_f90.f90.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, offset, buf, count, datatype, &
-        request, ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  integer(kind=MPI_OFFSET_KIND), intent(in) :: offset
-  ${type}, intent(in) :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, offset, buf, count, datatype, &
-        request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_iwrite_at ${rank} CH "character${dim}"
-  output MPI_File_iwrite_at ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_iwrite_at ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_iwrite_at ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_iwrite_at ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iwrite_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iwrite_f90.f90.sh
deleted file mode 100755
index 5c515194a5..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iwrite_f90.f90.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, buf, count, datatype, request&
-        , ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  ${type}, intent(in) :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, buf, count, datatype, request&
-        , ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_iwrite ${rank} CH "character${dim}"
-  output MPI_File_iwrite ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_iwrite ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_iwrite ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_iwrite ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iwrite_shared_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iwrite_shared_f90.f90.sh
deleted file mode 100755
index f4fca7cf2c..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_iwrite_shared_f90.f90.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, buf, count, datatype, request&
-        , ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  ${type}, intent(in) :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, buf, count, datatype, request&
-        , ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_iwrite_shared ${rank} CH "character${dim}"
-  output MPI_File_iwrite_shared ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_iwrite_shared ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_iwrite_shared ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_iwrite_shared ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_all_begin_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_all_begin_f90.f90.sh
deleted file mode 100755
index c0efc6ac64..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_all_begin_f90.f90.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, buf, count, datatype, ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  ${type} :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, buf, count, datatype, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_read_all_begin ${rank} CH "character${dim}"
-  output MPI_File_read_all_begin ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_read_all_begin ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_read_all_begin ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_read_all_begin ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_all_end_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_all_end_f90.f90.sh
deleted file mode 100755
index 755032cec3..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_all_end_f90.f90.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, buf, status, ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  ${type} :: buf
-  integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, buf, status, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_read_all_end ${rank} CH "character${dim}"
-  output MPI_File_read_all_end ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_read_all_end ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_read_all_end ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_read_all_end ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_all_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_all_f90.f90.sh
deleted file mode 100755
index 2a32d67ca2..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_all_f90.f90.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, buf, count, datatype, status&
-        , ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  ${type} :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, buf, count, datatype, status&
-        , ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_read_all ${rank} CH "character${dim}"
-  output MPI_File_read_all ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_read_all ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_read_all ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_read_all ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_at_all_begin_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_at_all_begin_f90.f90.sh
deleted file mode 100755
index b9e87570bf..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_at_all_begin_f90.f90.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, offset, buf, count, datatype&
-        , ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  integer(kind=MPI_OFFSET_KIND), intent(in) :: offset
-  ${type} :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, offset, buf, count, datatype&
-        , ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_read_at_all_begin ${rank} CH "character${dim}"
-  output MPI_File_read_at_all_begin ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_read_at_all_begin ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_read_at_all_begin ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_read_at_all_begin ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_at_all_end_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_at_all_end_f90.f90.sh
deleted file mode 100755
index 869a299fda..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_at_all_end_f90.f90.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, buf, status, ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  ${type} :: buf
-  integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, buf, status, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_read_at_all_end ${rank} CH "character${dim}"
-  output MPI_File_read_at_all_end ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_read_at_all_end ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_read_at_all_end ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_read_at_all_end ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_at_all_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_at_all_f90.f90.sh
deleted file mode 100755
index e92902fafd..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_at_all_f90.f90.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, offset, buf, count, datatype, &
-        status, ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  integer(kind=MPI_OFFSET_KIND), intent(in) :: offset
-  ${type} :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, offset, buf, count, datatype, &
-        status, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_read_at_all ${rank} CH "character${dim}"
-  output MPI_File_read_at_all ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_read_at_all ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_read_at_all ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_read_at_all ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_at_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_at_f90.f90.sh
deleted file mode 100755
index 20639c10db..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_at_f90.f90.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, offset, buf, count, datatype, &
-        status, ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  integer(kind=MPI_OFFSET_KIND), intent(in) :: offset
-  ${type} :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, offset, buf, count, datatype, &
-        status, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_read_at ${rank} CH "character${dim}"
-  output MPI_File_read_at ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_read_at ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_read_at ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_read_at ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_f90.f90.sh
deleted file mode 100755
index 8f5ecac039..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_f90.f90.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, buf, count, datatype, status&
-        , ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  ${type} :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, buf, count, datatype, status&
-        , ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_read ${rank} CH "character${dim}"
-  output MPI_File_read ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_read ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_read ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_read ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_ordered_begin_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_ordered_begin_f90.f90.sh
deleted file mode 100755
index f7b8e0c871..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_ordered_begin_f90.f90.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$3
-    type=$5
-    proc="$2$3D$4"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, buf, count, datatype, ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  ${type} :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, buf, count, datatype, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_read_ordered_begin MPI_File_read_ord_begin ${rank} CH "character${dim}"
-  output MPI_File_read_ordered_begin MPI_File_read_ord_begin ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_read_ordered_begin MPI_File_read_ord_begin ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_read_ordered_begin MPI_File_read_ord_begin ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_read_ordered_begin MPI_File_read_ord_begin ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_ordered_end_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_ordered_end_f90.f90.sh
deleted file mode 100755
index 92b455a6d0..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_ordered_end_f90.f90.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, buf, status, ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  ${type} :: buf
-  integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, buf, status, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_read_ordered_end ${rank} CH "character${dim}"
-  output MPI_File_read_ordered_end ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_read_ordered_end ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_read_ordered_end ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_read_ordered_end ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_ordered_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_ordered_f90.f90.sh
deleted file mode 100755
index 56d851d1e6..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_ordered_f90.f90.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, buf, count, datatype, status&
-        , ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  ${type} :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, buf, count, datatype, status&
-        , ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_read_ordered ${rank} CH "character${dim}"
-  output MPI_File_read_ordered ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_read_ordered ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_read_ordered ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_read_ordered ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_shared_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_shared_f90.f90.sh
deleted file mode 100755
index f46b436262..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_read_shared_f90.f90.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, buf, count, datatype, status&
-        , ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  ${type} :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, buf, count, datatype, status&
-        , ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_read_shared ${rank} CH "character${dim}"
-  output MPI_File_read_shared ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_read_shared ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_read_shared ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_read_shared ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_all_begin_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_all_begin_f90.f90.sh
deleted file mode 100755
index 30c408bf24..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_all_begin_f90.f90.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, buf, count, datatype, ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  ${type}, intent(in) :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, buf, count, datatype, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_write_all_begin ${rank} CH "character${dim}"
-  output MPI_File_write_all_begin ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_write_all_begin ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_write_all_begin ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_write_all_begin ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_all_end_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_all_end_f90.f90.sh
deleted file mode 100755
index 54a935f91d..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_all_end_f90.f90.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, buf, status, ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  ${type}, intent(in) :: buf
-  integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, buf, status, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_write_all_end ${rank} CH "character${dim}"
-  output MPI_File_write_all_end ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_write_all_end ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_write_all_end ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_write_all_end ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_all_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_all_f90.f90.sh
deleted file mode 100755
index 039cc1c711..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_all_f90.f90.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, buf, count, datatype, status&
-        , ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  ${type}, intent(in) :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, buf, count, datatype, status&
-        , ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_write_all ${rank} CH "character${dim}"
-  output MPI_File_write_all ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_write_all ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_write_all ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_write_all ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_at_all_begin_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_at_all_begin_f90.f90.sh
deleted file mode 100755
index c1c5ae02aa..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_at_all_begin_f90.f90.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$3
-    type=$5
-    proc="$2$3D$4"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, offset, buf, count, datatype&
-        , ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  integer(kind=MPI_OFFSET_KIND), intent(in) :: offset
-  ${type}, intent(in) :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, offset, buf, count, datatype&
-        , ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_write_at_all_begin MPI_File_wr_at_all_begin ${rank} CH "character${dim}"
-  output MPI_File_write_at_all_begin MPI_File_wr_at_all_begin ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_write_at_all_begin MPI_File_wr_at_all_begin ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_write_at_all_begin MPI_File_wr_at_all_begin ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_write_at_all_begin MPI_File_wr_at_all_begin ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_at_all_end_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_at_all_end_f90.f90.sh
deleted file mode 100755
index 0e96e7791a..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_at_all_end_f90.f90.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, buf, status, ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  ${type}, intent(in) :: buf
-  integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, buf, status, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_write_at_all_end ${rank} CH "character${dim}"
-  output MPI_File_write_at_all_end ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_write_at_all_end ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_write_at_all_end ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_write_at_all_end ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_at_all_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_at_all_f90.f90.sh
deleted file mode 100755
index 658afd8ab0..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_at_all_f90.f90.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, offset, buf, count, datatype, &
-        status, ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  integer(kind=MPI_OFFSET_KIND), intent(in) :: offset
-  ${type}, intent(in) :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, offset, buf, count, datatype, &
-        status, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_write_at_all ${rank} CH "character${dim}"
-  output MPI_File_write_at_all ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_write_at_all ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_write_at_all ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_write_at_all ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_at_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_at_f90.f90.sh
deleted file mode 100755
index 7dcea930fd..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_at_f90.f90.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, offset, buf, count, datatype, &
-        status, ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  integer(kind=MPI_OFFSET_KIND), intent(in) :: offset
-  ${type}, intent(in) :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, offset, buf, count, datatype, &
-        status, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_write_at ${rank} CH "character${dim}"
-  output MPI_File_write_at ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_write_at ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_write_at ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_write_at ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_f90.f90.sh
deleted file mode 100755
index e5be4ac33f..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_f90.f90.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, buf, count, datatype, status&
-        , ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  ${type}, intent(in) :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, buf, count, datatype, status&
-        , ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_write ${rank} CH "character${dim}"
-  output MPI_File_write ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_write ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_write ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_write ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_ordered_begin_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_ordered_begin_f90.f90.sh
deleted file mode 100755
index f18ce7065b..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_ordered_begin_f90.f90.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, buf, count, datatype, ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  ${type}, intent(in) :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, buf, count, datatype, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_write_ordered_begin ${rank} CH "character${dim}"
-  output MPI_File_write_ordered_begin ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_write_ordered_begin ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_write_ordered_begin ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_write_ordered_begin ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_ordered_end_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_ordered_end_f90.f90.sh
deleted file mode 100755
index 9e80f475d1..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_ordered_end_f90.f90.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, buf, status, ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  ${type}, intent(in) :: buf
-  integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, buf, status, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_write_ordered_end ${rank} CH "character${dim}"
-  output MPI_File_write_ordered_end ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_write_ordered_end ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_write_ordered_end ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_write_ordered_end ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_ordered_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_ordered_f90.f90.sh
deleted file mode 100755
index 9be4a4d2bc..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_ordered_f90.f90.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, buf, count, datatype, status&
-        , ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  ${type}, intent(in) :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, buf, count, datatype, status&
-        , ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_write_ordered ${rank} CH "character${dim}"
-  output MPI_File_write_ordered ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_write_ordered ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_write_ordered ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_write_ordered ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_shared_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_shared_f90.f90.sh
deleted file mode 100755
index da09f45baf..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_file_write_shared_f90.f90.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(fh, buf, count, datatype, status&
-        , ierror)
-  include "mpif-config.h"
-  integer, intent(in) :: fh
-  ${type}, intent(in) :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, dimension(MPI_STATUS_SIZE), intent(out) :: status
-  integer, intent(out) :: ierror
-  call ${procedure}(fh, buf, count, datatype, status&
-        , ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_File_write_shared ${rank} CH "character${dim}"
-  output MPI_File_write_shared ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_File_write_shared ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_File_write_shared ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_File_write_shared ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_free_mem_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_free_mem_f90.f90.sh
deleted file mode 100755
index d826d07c56..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_free_mem_f90.f90.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2013 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(base, ierror)
-  ${type}, intent(in) :: base
-  integer, intent(out) :: ierror
-  call ${procedure}(base, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Free_mem ${rank} CH "character${dim}"
-  output MPI_Free_mem ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Free_mem ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Free_mem ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Free_mem ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_gather_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_gather_f90.f90.sh
deleted file mode 100755
index 224a36fb08..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_gather_f90.f90.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, root, comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, intent(in) :: sendcount
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, intent(in) :: recvcount
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: root
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, root, comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Gather ${rank} CH "character${dim}"
-  output MPI_Gather ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Gather ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Gather ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Gather ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_gatherv_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_gatherv_f90.f90.sh
deleted file mode 100755
index 75da47e3fe..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_gatherv_f90.f90.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcount, sendtype, recvbuf, recvcounts, &
-        displs, recvtype, root, comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, intent(in) :: sendcount
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, dimension(*), intent(in) :: recvcounts
-  integer, dimension(*), intent(in) :: displs
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: root
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcount, sendtype, recvbuf, recvcounts, &
-        displs, recvtype, root, comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Gatherv ${rank} CH "character${dim}"
-  output MPI_Gatherv ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Gatherv ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Gatherv ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Gatherv ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_get_address_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_get_address_f90.f90.sh
deleted file mode 100755
index 5f9bb79e29..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_get_address_f90.f90.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(location, address, ierr)
-  include "mpif-config.h"
-  ${type}, intent(in) :: location
-  integer(kind=MPI_ADDRESS_KIND), intent(out) :: address
-  integer, intent(out) :: ierr
-  call ${procedure}(location, address, ierr)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Get_address ${rank} CH "character${dim}"
-  output MPI_Get_address ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Get_address ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Get_address ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Get_address ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_get_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_get_f90.f90.sh
deleted file mode 100755
index 5ffe6c8bca..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_get_f90.f90.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2012      FUJITSU LIMITED.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(origin_addr, origin_count, origin_datatype, target_rank, target_disp, &
-        target_count, target_datatype, win, ierror)
-  include "mpif-config.h"
-  ${type} :: origin_addr
-  integer, intent(in) :: origin_count
-  integer, intent(in) :: origin_datatype
-  integer, intent(in) :: target_rank
-  integer(kind=MPI_ADDRESS_KIND), intent(in) :: target_disp
-  integer, intent(in) :: target_count
-  integer, intent(in) :: target_datatype
-  integer, intent(in) :: win
-  integer, intent(out) :: ierror
-  call ${procedure}(origin_addr, origin_count, origin_datatype, target_rank, target_disp, &
-        target_count, target_datatype, win, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Get ${rank} CH "character${dim}"
-  output MPI_Get ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Get ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Get ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Get ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iallgather_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iallgather_f90.f90.sh
deleted file mode 100755
index 3f00d03540..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iallgather_f90.f90.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, intent(in) :: sendcount
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, intent(in) :: recvcount
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Iallgather ${rank} CH "character${dim}"
-  output MPI_Iallgather ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Iallgather ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Iallgather ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Iallgather ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iallgatherv_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iallgatherv_f90.f90.sh
deleted file mode 100755
index a4cba1e80e..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iallgatherv_f90.f90.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcount, sendtype, recvbuf, recvcounts, &
-        displs, recvtype, comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, intent(in) :: sendcount
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, dimension(*), intent(in) :: recvcounts
-  integer, dimension(*), intent(in) :: displs
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcount, sendtype, recvbuf, recvcounts, &
-        displs, recvtype, comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Iallgatherv ${rank} CH "character${dim}"
-  output MPI_Iallgatherv ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Iallgatherv ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Iallgatherv ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Iallgatherv ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iallreduce_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iallreduce_f90.f90.sh
deleted file mode 100755
index f952bf9b0b..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iallreduce_f90.f90.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, recvbuf, count, datatype, op, &
-        comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  ${type} :: recvbuf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: op
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, recvbuf, count, datatype, op, &
-        comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Iallreduce ${rank} CH "character${dim}"
-  output MPI_Iallreduce ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Iallreduce ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Iallreduce ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Iallreduce ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ialltoall_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ialltoall_f90.f90.sh
deleted file mode 100755
index b308e7026d..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ialltoall_f90.f90.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, intent(in) :: sendcount
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, intent(in) :: recvcount
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Ialltoall ${rank} CH "character${dim}"
-  output MPI_Ialltoall ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Ialltoall ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Ialltoall ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Ialltoall ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ialltoallv_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ialltoallv_f90.f90.sh
deleted file mode 100755
index 922693a65c..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ialltoallv_f90.f90.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcounts, sdispls, sendtype, recvbuf, &
-        recvcounts, rdispls, recvtype, comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, dimension(*), intent(in) :: sendcounts
-  integer, dimension(*), intent(in) :: sdispls
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, dimension(*), intent(in) :: recvcounts
-  integer, dimension(*), intent(in) :: rdispls
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcounts, sdispls, sendtype, recvbuf, &
-        recvcounts, rdispls, recvtype, comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Ialltoallv ${rank} CH "character${dim}"
-  output MPI_Ialltoallv ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Ialltoallv ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Ialltoallv ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Ialltoallv ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ialltoallw_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ialltoallw_f90.f90.sh
deleted file mode 100755
index d6c6f5ae53..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ialltoallw_f90.f90.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, &
-        recvcounts, rdispls, recvtypes, comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, dimension(*), intent(in) :: sendcounts
-  integer, dimension(*), intent(in) :: sdispls
-  integer, dimension(*), intent(in) :: sendtypes
-  ${type} :: recvbuf
-  integer, dimension(*), intent(in) :: recvcounts
-  integer, dimension(*), intent(in) :: rdispls
-  integer, dimension(*), intent(in) :: recvtypes
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, &
-        recvcounts, rdispls, recvtypes, comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Ialltoallw ${rank} CH "character${dim}"
-  output MPI_Ialltoallw ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Ialltoallw ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Ialltoallw ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Ialltoallw ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ibcast_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ibcast_f90.f90.sh
deleted file mode 100755
index 486588b096..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ibcast_f90.f90.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2012      FUJITSU LIMITED.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(buffer, count, datatype, root, comm&
-        , request, ierror)
-  include "mpif-config.h"
-  ${type} :: buffer
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: root
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(buffer, count, datatype, root, comm&
-        , request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Ibcast ${rank} CH "character${dim}"
-  output MPI_Ibcast ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Ibcast ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Ibcast ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Ibcast ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ibsend_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ibsend_f90.f90.sh
deleted file mode 100755
index f6e46e89ac..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ibsend_f90.f90.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(buf, count, datatype, dest, tag, &
-        comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: dest
-  integer, intent(in) :: tag
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(buf, count, datatype, dest, tag, &
-        comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Ibsend ${rank} CH "character${dim}"
-  output MPI_Ibsend ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Ibsend ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Ibsend ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Ibsend ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iexscan_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iexscan_f90.f90.sh
deleted file mode 100755
index 0892e67e93..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iexscan_f90.f90.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, recvbuf, count, datatype, op, &
-        comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  ${type} :: recvbuf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: op
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, recvbuf, count, datatype, op, &
-        comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Iexscan ${rank} CH "character${dim}"
-  output MPI_Iexscan ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Iexscan ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Iexscan ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Iexscan ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_igather_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_igather_f90.f90.sh
deleted file mode 100755
index 81082d3afe..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_igather_f90.f90.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, root, comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, intent(in) :: sendcount
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, intent(in) :: recvcount
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: root
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, root, comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Igather ${rank} CH "character${dim}"
-  output MPI_Igather ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Igather ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Igather ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Igather ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_igatherv_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_igatherv_f90.f90.sh
deleted file mode 100755
index e493a83874..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_igatherv_f90.f90.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcount, sendtype, recvbuf, recvcounts, &
-        displs, recvtype, root, comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, intent(in) :: sendcount
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, dimension(*), intent(in) :: recvcounts
-  integer, dimension(*), intent(in) :: displs
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: root
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcount, sendtype, recvbuf, recvcounts, &
-        displs, recvtype, root, comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Igatherv ${rank} CH "character${dim}"
-  output MPI_Igatherv ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Igatherv ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Igatherv ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Igatherv ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_imrecv_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_imrecv_f90.f90.sh
deleted file mode 100755
index 9eb79c8933..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_imrecv_f90.f90.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(buf, count, datatype, message, request, ierror)
-  include "mpif-config.h"
-  ${type} :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(inout) :: message
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(buf, count, datatype, message, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Imrecv ${rank} CH "character${dim}"
-  output MPI_Imrecv ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Imrecv ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Imrecv ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Imrecv ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ineighbor_allgather_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ineighbor_allgather_f90.f90.sh
deleted file mode 100755
index 269d695ba7..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ineighbor_allgather_f90.f90.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2013      Los Alamos National Security, LLC. All rights
-#                         reserved.
-# $COPYRIGHT$
-#
-# Additional copyrights may follow
-#
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, intent(in) :: sendcount
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, intent(in) :: recvcount
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Ineighbor_allgather ${rank} CH "character${dim}"
-  output MPI_Ineighbor_allgather ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Ineighbor_allgather ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Ineighbor_allgather ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Ineighbor_allgather ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ineighbor_allgatherv_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ineighbor_allgatherv_f90.f90.sh
deleted file mode 100755
index 4c01b8a480..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ineighbor_allgatherv_f90.f90.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2013      Los Alamos National Security, LLC. All rights
-#                         reserved.
-# $COPYRIGHT$
-#
-# Additional copyrights may follow
-#
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcount, sendtype, recvbuf, recvcounts, &
-        displs, recvtype, comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, intent(in) :: sendcount
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, dimension(*), intent(in) :: recvcounts
-  integer, dimension(*), intent(in) :: displs
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcount, sendtype, recvbuf, recvcounts, &
-        displs, recvtype, comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Ineighbor_allgatherv ${rank} CH "character${dim}"
-  output MPI_Ineighbor_allgatherv ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Ineighbor_allgatherv ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Ineighbor_allgatherv ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Ineighbor_allgatherv ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ineighbor_alltoall_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ineighbor_alltoall_f90.f90.sh
deleted file mode 100755
index 66ad5cea03..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ineighbor_alltoall_f90.f90.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2013      Los Alamos National Security, LLC. All rights
-#                         reserved.
-# $COPYRIGHT$
-#
-# Additional copyrights may follow
-#
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, intent(in) :: sendcount
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, intent(in) :: recvcount
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Ineighbor_alltoall ${rank} CH "character${dim}"
-  output MPI_Ineighbor_alltoall ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Ineighbor_alltoall ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Ineighbor_alltoall ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Ineighbor_alltoall ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ineighbor_alltoallv_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ineighbor_alltoallv_f90.f90.sh
deleted file mode 100755
index e5d484e343..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ineighbor_alltoallv_f90.f90.sh
+++ /dev/null
@@ -1,97 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2013      Los Alamos National Security, LLC. All rights
-#                         reserved.
-# $COPYRIGHT$
-#
-# Additional copyrights may follow
-#
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcounts, sdispls, sendtype, recvbuf, &
-        recvcounts, rdispls, recvtype, comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, dimension(*), intent(in) :: sendcounts
-  integer, dimension(*), intent(in) :: sdispls
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, dimension(*), intent(in) :: recvcounts
-  integer, dimension(*), intent(in) :: rdispls
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcounts, sdispls, sendtype, recvbuf, &
-        recvcounts, rdispls, recvtype, comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Ineighbor_alltoallv ${rank} CH "character${dim}"
-  output MPI_Ineighbor_alltoallv ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Ineighbor_alltoallv ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Ineighbor_alltoallv ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Ineighbor_alltoallv ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ineighbor_alltoallw_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ineighbor_alltoallw_f90.f90.sh
deleted file mode 100755
index a7d726e10c..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ineighbor_alltoallw_f90.f90.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-#
-# Additional copyrights may follow
-#
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, &
-        recvcounts, rdispls, recvtypes, comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, dimension(*), intent(in) :: sendcounts
-  integer(kind=MPI_ADDRESS_KIND), intent(in) :: sdispls
-  integer, dimension(*), intent(in) :: sendtypes
-  ${type} :: recvbuf
-  integer, dimension(*), intent(in) :: recvcounts
-  integer(kind=MPI_ADDRESS_KIND) :: rdispls
-  integer, dimension(*), intent(in) :: recvtypes
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, &
-        recvcounts, rdispls, recvtypes, comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Ineighbor_alltoallw ${rank} CH "character${dim}"
-  output MPI_Ineighbor_alltoallw ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Ineighbor_alltoallw ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Ineighbor_alltoallw ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Ineighbor_alltoallw ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_irecv_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_irecv_f90.f90.sh
deleted file mode 100755
index 03c42a38c2..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_irecv_f90.f90.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(buf, count, datatype, source, tag, &
-        comm, request, ierror)
-  include "mpif-config.h"
-  ${type} :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: source
-  integer, intent(in) :: tag
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(buf, count, datatype, source, tag, &
-        comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Irecv ${rank} CH "character${dim}"
-  output MPI_Irecv ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Irecv ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Irecv ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Irecv ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ireduce_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ireduce_f90.f90.sh
deleted file mode 100755
index b16c5d5ea7..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ireduce_f90.f90.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, recvbuf, count, datatype, op, &
-        root, comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  ${type} :: recvbuf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: op
-  integer, intent(in) :: root
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, recvbuf, count, datatype, op, &
-        root, comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Ireduce ${rank} CH "character${dim}"
-  output MPI_Ireduce ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Ireduce ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Ireduce ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Ireduce ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ireduce_scatter_block_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ireduce_scatter_block_f90.f90.sh
deleted file mode 100755
index 61e259fcda..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ireduce_scatter_block_f90.f90.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2012      FUJITSU LIMITED.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, recvbuf, datatype, op, &
-        comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  ${type} :: recvbuf
-  integer, intent(in) :: recvcount
-  integer, intent(in) :: datatype
-  integer, intent(in) :: op
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, recvbuf, recvcount, datatype, op, &
-        comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Ireduce_scatter_block ${rank} CH "character${dim}"
-  output MPI_Ireduce_scatter_block ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Ireduce_scatter_block ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Ireduce_scatter_block ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Ireduce_scatter_block ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ireduce_scatter_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ireduce_scatter_f90.f90.sh
deleted file mode 100755
index 5e372244fe..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ireduce_scatter_f90.f90.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2012      FUJITSU LIMITED.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, recvbuf, recvcounts, datatype, op, &
-        comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  ${type} :: recvbuf
-  integer, dimension(*), intent(in) :: recvcounts
-  integer, intent(in) :: datatype
-  integer, intent(in) :: op
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, recvbuf, recvcounts, datatype, op, &
-        comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Ireduce_scatter ${rank} CH "character${dim}"
-  output MPI_Ireduce_scatter ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Ireduce_scatter ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Ireduce_scatter ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Ireduce_scatter ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_irsend_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_irsend_f90.f90.sh
deleted file mode 100755
index 37492cae4f..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_irsend_f90.f90.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(buf, count, datatype, dest, tag, &
-        comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: dest
-  integer, intent(in) :: tag
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(buf, count, datatype, dest, tag, &
-        comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Irsend ${rank} CH "character${dim}"
-  output MPI_Irsend ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Irsend ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Irsend ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Irsend ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iscan_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iscan_f90.f90.sh
deleted file mode 100755
index dfd0aad5bc..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iscan_f90.f90.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, recvbuf, count, datatype, op, &
-        comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  ${type} :: recvbuf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: op
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, recvbuf, count, datatype, op, &
-        comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Iscan ${rank} CH "character${dim}"
-  output MPI_Iscan ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Iscan ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Iscan ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Iscan ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iscatter_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iscatter_f90.f90.sh
deleted file mode 100755
index 20a97d9fe7..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iscatter_f90.f90.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, root, comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, intent(in) :: sendcount
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, intent(in) :: recvcount
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: root
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, root, comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Iscatter ${rank} CH "character${dim}"
-  output MPI_Iscatter ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Iscatter ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Iscatter ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Iscatter ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iscatterv_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iscatterv_f90.f90.sh
deleted file mode 100755
index aca27017f2..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_iscatterv_f90.f90.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in large modules.  So if
-# we're not at least large, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcounts, displs, sendtype, recvbuf, &
-        recvcount, recvtype, root, comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, dimension(*), intent(in) :: sendcounts
-  integer, dimension(*), intent(in) :: displs
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, intent(in) :: recvcount
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: root
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcounts, displs, sendtype, recvbuf, &
-        recvcount, recvtype, root, comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Iscatterv ${rank} CH "character${dim}"
-  output MPI_Iscatterv ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Iscatterv ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Iscatterv ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Iscatterv ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_isend_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_isend_f90.f90.sh
deleted file mode 100755
index 99c71ea20f..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_isend_f90.f90.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(buf, count, datatype, dest, tag, &
-        comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: dest
-  integer, intent(in) :: tag
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(buf, count, datatype, dest, tag, &
-        comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Isend ${rank} CH "character${dim}"
-  output MPI_Isend ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Isend ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Isend ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Isend ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_issend_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_issend_f90.f90.sh
deleted file mode 100755
index 2752b91558..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_issend_f90.f90.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(buf, count, datatype, dest, tag, &
-        comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: dest
-  integer, intent(in) :: tag
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(buf, count, datatype, dest, tag, &
-        comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Issend ${rank} CH "character${dim}"
-  output MPI_Issend ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Issend ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Issend ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Issend ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_mrecv_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_mrecv_f90.f90.sh
deleted file mode 100755
index b03c36cdd0..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_mrecv_f90.f90.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(buf, count, datatype, message, status, ierror)
-  include "mpif-config.h"
-  ${type} :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(inout) :: message
-  integer, dimension(MPI_STATUS_SIZE), intent(inout) :: status
-  integer, intent(out) :: ierror
-  call ${procedure}(buf, count, datatype, message, status, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Mrecv ${rank} CH "character${dim}"
-  output MPI_Mrecv ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Mrecv ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Mrecv ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Mrecv ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_neighbor_allgather_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_neighbor_allgather_f90.f90.sh
deleted file mode 100755
index 6afa050ee4..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_neighbor_allgather_f90.f90.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2013      Los Alamos National Security, LLC. All rights
-#                         reserved.
-# $COPYRIGHT$
-#
-# Additional copyrights may follow
-#
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, intent(in) :: sendcount
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, intent(in) :: recvcount
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Neighbor_allgather ${rank} CH "character${dim}"
-  output MPI_Neighbor_allgather ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Neighbor_allgather ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Neighbor_allgather ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Neighbor_allgather ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_neighbor_allgatherv_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_neighbor_allgatherv_f90.f90.sh
deleted file mode 100755
index 7e6134359e..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_neighbor_allgatherv_f90.f90.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2013      Los Alamos National Security, LLC. All rights
-#                         reserved.
-# $COPYRIGHT$
-#
-# Additional copyrights may follow
-#
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcount, sendtype, recvbuf, recvcounts, &
-        displs, recvtype, comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, intent(in) :: sendcount
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, dimension(*), intent(in) :: recvcounts
-  integer, dimension(*), intent(in) :: displs
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcount, sendtype, recvbuf, recvcounts, &
-        displs, recvtype, comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Neighbor_allgatherv ${rank} CH "character${dim}"
-  output MPI_Neighbor_allgatherv ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Neighbor_allgatherv ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Neighbor_allgatherv ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Neighbor_allgatherv ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_neighbor_alltoall_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_neighbor_alltoall_f90.f90.sh
deleted file mode 100755
index 3f204a1788..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_neighbor_alltoall_f90.f90.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2013      Los Alamos National Security, LLC. All rights
-#                         reserved.
-# $COPYRIGHT$
-#
-# Additional copyrights may follow
-#
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, intent(in) :: sendcount
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, intent(in) :: recvcount
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Neighbor_alltoall ${rank} CH "character${dim}"
-  output MPI_Neighbor_alltoall ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Neighbor_alltoall ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Neighbor_alltoall ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Neighbor_alltoall ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_neighbor_alltoallv_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_neighbor_alltoallv_f90.f90.sh
deleted file mode 100755
index 2632555217..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_neighbor_alltoallv_f90.f90.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2013      Los Alamos National Security, LLC. All rights
-#                         reserved.
-# $COPYRIGHT$
-#
-# Additional copyrights may follow
-#
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcounts, sdispls, sendtype, recvbuf, &
-        recvcounts, rdispls, recvtype, comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, dimension(*), intent(in) :: sendcounts
-  integer, dimension(*), intent(in) :: sdispls
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, dimension(*), intent(in) :: recvcounts
-  integer, dimension(*), intent(in) :: rdispls
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcounts, sdispls, sendtype, recvbuf, &
-        recvcounts, rdispls, recvtype, comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Neighbor_alltoallv ${rank} CH "character${dim}"
-  output MPI_Neighbor_alltoallv ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Neighbor_alltoallv ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Neighbor_alltoallv ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Neighbor_alltoallv ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_neighbor_alltoallw_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_neighbor_alltoallw_f90.f90.sh
deleted file mode 100755
index 2272cf21a2..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_neighbor_alltoallw_f90.f90.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2013      Los Alamos National Security, LLC. All rights
-#                         reserved.
-# $COPYRIGHT$
-#
-# Additional copyrights may follow
-#
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, &
-        recvcounts, rdispls, recvtypes, comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, dimension(*), intent(in) :: sendcounts
-  integer(kind=MPI_ADDRESS_KIND), intent(in) :: sdispls
-  integer, dimension(*), intent(in) :: sendtypes
-  ${type} :: recvbuf
-  integer, dimension(*), intent(in) :: recvcounts
-  integer(kind=MPI_ADDRESS_KIND), intent(in) :: rdispls
-  integer, dimension(*), intent(in) :: recvtypes
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, &
-        recvcounts, rdispls, recvtypes, comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Neighbor_alltoallw ${rank} CH "character${dim}"
-  output MPI_Neighbor_alltoallw ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Neighbor_alltoallw ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Neighbor_alltoallw ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Neighbor_alltoallw ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_pack_external_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_pack_external_f90.f90.sh
deleted file mode 100755
index 71c16f46b9..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_pack_external_f90.f90.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(datarep, inbuf, incount, datatype, outbuf, &
-        outsize, position, ierror)
-  include "mpif-config.h"
-  character(len=*), intent(in) :: datarep
-  ${type}, intent(in) :: inbuf
-  integer, intent(in) :: incount
-  integer, intent(in) :: datatype
-  ${type} :: outbuf
-  integer(kind=MPI_ADDRESS_KIND), intent(in) :: outsize
-  integer(kind=MPI_ADDRESS_KIND), intent(inout) :: position
-  integer, intent(out) :: ierror
-  call ${procedure}(datarep, inbuf, incount, datatype, outbuf, &
-        outsize, position, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Pack_external ${rank} CH "character${dim}"
-  output MPI_Pack_external ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Pack_external ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Pack_external ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Pack_external ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_pack_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_pack_f90.f90.sh
deleted file mode 100755
index 351cd930ee..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_pack_f90.f90.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2012      FUJITSU LIMITED.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(inbuf, incount, datatype, outbuf, outsize, &
-        position, comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: inbuf
-  integer, intent(in) :: incount
-  integer, intent(in) :: datatype
-  ${type} :: outbuf
-  integer, intent(in) :: outsize
-  integer, intent(inout) :: position
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(inbuf, incount, datatype, outbuf, outsize, &
-        position, comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Pack ${rank} CH "character${dim}"
-  output MPI_Pack ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Pack ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Pack ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Pack ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_put_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_put_f90.f90.sh
deleted file mode 100755
index 4e627f5f53..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_put_f90.f90.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(origin_addr, origin_count, origin_datatype, target_rank, target_disp, &
-        target_count, target_datatype, win, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: origin_addr
-  integer, intent(in) :: origin_count
-  integer, intent(in) :: origin_datatype
-  integer, intent(in) :: target_rank
-  integer(kind=MPI_ADDRESS_KIND), intent(in) :: target_disp
-  integer, intent(in) :: target_count
-  integer, intent(in) :: target_datatype
-  integer, intent(in) :: win
-  integer, intent(out) :: ierror
-  call ${procedure}(origin_addr, origin_count, origin_datatype, target_rank, target_disp, &
-        target_count, target_datatype, win, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Put ${rank} CH "character${dim}"
-  output MPI_Put ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Put ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Put ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Put ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_recv_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_recv_f90.f90.sh
deleted file mode 100755
index 2897affd92..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_recv_f90.f90.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(buf, count, datatype, source, tag, &
-        comm, status, ierror)
-  include "mpif-config.h"
-  ${type} :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: source
-  integer, intent(in) :: tag
-  integer, intent(in) :: comm
-  integer, dimension(MPI_STATUS_SIZE), intent(inout) :: status
-  integer, intent(out) :: ierror
-  call ${procedure}(buf, count, datatype, source, tag, &
-        comm, status, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Recv ${rank} CH "character${dim}"
-  output MPI_Recv ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Recv ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Recv ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Recv ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_recv_init_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_recv_init_f90.f90.sh
deleted file mode 100755
index a69a260c42..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_recv_init_f90.f90.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(buf, count, datatype, source, tag, &
-        comm, request, ierror)
-  include "mpif-config.h"
-  ${type} :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: source
-  integer, intent(in) :: tag
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(buf, count, datatype, source, tag, &
-        comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Recv_init ${rank} CH "character${dim}"
-  output MPI_Recv_init ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Recv_init ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Recv_init ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Recv_init ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_reduce_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_reduce_f90.f90.sh
deleted file mode 100755
index 15bbbe328e..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_reduce_f90.f90.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, recvbuf, count, datatype, op, &
-        root, comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  ${type} :: recvbuf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: op
-  integer, intent(in) :: root
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, recvbuf, count, datatype, op, &
-        root, comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Reduce ${rank} CH "character${dim}"
-  output MPI_Reduce ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Reduce ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Reduce ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Reduce ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_reduce_scatter_block_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_reduce_scatter_block_f90.f90.sh
deleted file mode 100755
index d20d2efe6c..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_reduce_scatter_block_f90.f90.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2012      FUJITSU LIMITED.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, recvbuf, recvcount, datatype, op, &
-        comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  ${type} :: recvbuf
-  integer, intent(in) :: recvcount
-  integer, intent(in) :: datatype
-  integer, intent(in) :: op
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, recvbuf, recvcount, datatype, op, &
-        comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Reduce_scatter_block ${rank} CH "character${dim}"
-  output MPI_Reduce_scatter_block ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Reduce_scatter_block ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Reduce_scatter_block ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Reduce_scatter_block ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_reduce_scatter_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_reduce_scatter_f90.f90.sh
deleted file mode 100755
index e9791fb35a..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_reduce_scatter_f90.f90.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2012      FUJITSU LIMITED.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, recvbuf, recvcounts, datatype, op, &
-        comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  ${type} :: recvbuf
-  integer, dimension(*), intent(in) :: recvcounts
-  integer, intent(in) :: datatype
-  integer, intent(in) :: op
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, recvbuf, recvcounts, datatype, op, &
-        comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Reduce_scatter ${rank} CH "character${dim}"
-  output MPI_Reduce_scatter ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Reduce_scatter ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Reduce_scatter ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Reduce_scatter ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_rsend_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_rsend_f90.f90.sh
deleted file mode 100755
index 463e61ea8d..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_rsend_f90.f90.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(ibuf, count, datatype, dest, tag, &
-        comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: ibuf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: dest
-  integer, intent(in) :: tag
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(ibuf, count, datatype, dest, tag, &
-        comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Rsend ${rank} CH "character${dim}"
-  output MPI_Rsend ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Rsend ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Rsend ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Rsend ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_rsend_init_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_rsend_init_f90.f90.sh
deleted file mode 100755
index a4597c46cd..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_rsend_init_f90.f90.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(buf, count, datatype, dest, tag, &
-        comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: dest
-  integer, intent(in) :: tag
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(buf, count, datatype, dest, tag, &
-        comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Rsend_init ${rank} CH "character${dim}"
-  output MPI_Rsend_init ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Rsend_init ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Rsend_init ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Rsend_init ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_scan_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_scan_f90.f90.sh
deleted file mode 100755
index 660019b164..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_scan_f90.f90.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, recvbuf, count, datatype, op, &
-        comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  ${type} :: recvbuf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: op
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, recvbuf, count, datatype, op, &
-        comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Scan ${rank} CH "character${dim}"
-  output MPI_Scan ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Scan ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Scan ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Scan ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_scatter_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_scatter_f90.f90.sh
deleted file mode 100755
index 066c02ed9c..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_scatter_f90.f90.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, root, comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, intent(in) :: sendcount
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, intent(in) :: recvcount
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: root
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcount, sendtype, recvbuf, recvcount, &
-        recvtype, root, comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Scatter ${rank} CH "character${dim}"
-  output MPI_Scatter ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Scatter ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Scatter ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Scatter ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_scatterv_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_scatterv_f90.f90.sh
deleted file mode 100755
index 8fd3bd567b..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_scatterv_f90.f90.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in large modules.  So if
-# we're not at least large, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcounts, displs, sendtype, recvbuf, &
-        recvcount, recvtype, root, comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, dimension(*), intent(in) :: sendcounts
-  integer, dimension(*), intent(in) :: displs
-  integer, intent(in) :: sendtype
-  ${type} :: recvbuf
-  integer, intent(in) :: recvcount
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: root
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcounts, displs, sendtype, recvbuf, &
-        recvcount, recvtype, root, comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Scatterv ${rank} CH "character${dim}"
-  output MPI_Scatterv ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Scatterv ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Scatterv ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Scatterv ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_send_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_send_f90.f90.sh
deleted file mode 100755
index 4565160b46..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_send_f90.f90.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(buf, count, datatype, dest, tag, &
-        comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: dest
-  integer, intent(in) :: tag
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(buf, count, datatype, dest, tag, &
-        comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Send ${rank} CH "character${dim}"
-  output MPI_Send ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Send ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Send ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Send ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_send_init_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_send_init_f90.f90.sh
deleted file mode 100755
index dbfc3e3690..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_send_init_f90.f90.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(buf, count, datatype, dest, tag, &
-        comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: dest
-  integer, intent(in) :: tag
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(buf, count, datatype, dest, tag, &
-        comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Send_init ${rank} CH "character${dim}"
-  output MPI_Send_init ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Send_init ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Send_init ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Send_init ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_sendrecv_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_sendrecv_f90.f90.sh
deleted file mode 100755
index 664eb29a9b..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_sendrecv_f90.f90.sh
+++ /dev/null
@@ -1,97 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size large
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(sendbuf, sendcount, sendtype, dest, sendtag, &
-        recvbuf, recvcount, recvtype, source, recvtag, comm, status, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: sendbuf
-  integer, intent(in) :: sendcount
-  integer, intent(in) :: sendtype
-  integer, intent(in) :: dest
-  integer, intent(in) :: sendtag
-  ${type} :: recvbuf
-  integer, intent(in) :: recvcount
-  integer, intent(in) :: recvtype
-  integer, intent(in) :: source
-  integer, intent(in) :: recvtag
-  integer, intent(in) :: comm
-  integer, dimension(MPI_STATUS_SIZE), intent(inout) :: status
-  integer, intent(out) :: ierror
-  call ${procedure}(sendbuf, sendcount, sendtype, dest, sendtag, &
-        recvbuf, recvcount, recvtype, source, recvtag, comm, status, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Sendrecv ${rank} CH "character${dim}"
-  output MPI_Sendrecv ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Sendrecv ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Sendrecv ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Sendrecv ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_sendrecv_replace_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_sendrecv_replace_f90.f90.sh
deleted file mode 100755
index 6932399083..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_sendrecv_replace_f90.f90.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(buf, count, datatype, dest, sendtag, &
-        source, recvtag, comm, status, ierror)
-  include "mpif-config.h"
-  ${type} :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: dest
-  integer, intent(in) :: sendtag
-  integer, intent(in) :: source
-  integer, intent(in) :: recvtag
-  integer, intent(in) :: comm
-  integer, dimension(MPI_STATUS_SIZE), intent(inout) :: status
-  integer, intent(out) :: ierror
-  call ${procedure}(buf, count, datatype, dest, sendtag, &
-        source, recvtag, comm, status, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Sendrecv_replace ${rank} CH "character${dim}"
-  output MPI_Sendrecv_replace ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Sendrecv_replace ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Sendrecv_replace ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Sendrecv_replace ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ssend_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ssend_f90.f90.sh
deleted file mode 100755
index ad27a93022..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ssend_f90.f90.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(buf, count, datatype, dest, tag, &
-        comm, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: dest
-  integer, intent(in) :: tag
-  integer, intent(in) :: comm
-  integer, intent(out) :: ierror
-  call ${procedure}(buf, count, datatype, dest, tag, &
-        comm, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Ssend ${rank} CH "character${dim}"
-  output MPI_Ssend ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Ssend ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Ssend ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Ssend ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ssend_init_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ssend_init_f90.f90.sh
deleted file mode 100755
index a6e20c739c..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_ssend_init_f90.f90.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(buf, count, datatype, dest, tag, &
-        comm, request, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: buf
-  integer, intent(in) :: count
-  integer, intent(in) :: datatype
-  integer, intent(in) :: dest
-  integer, intent(in) :: tag
-  integer, intent(in) :: comm
-  integer, intent(out) :: request
-  integer, intent(out) :: ierror
-  call ${procedure}(buf, count, datatype, dest, tag, &
-        comm, request, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Ssend_init ${rank} CH "character${dim}"
-  output MPI_Ssend_init ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Ssend_init ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Ssend_init ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Ssend_init ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done
diff --git a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_win_create_f90.f90.sh b/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_win_create_f90.f90.sh
deleted file mode 100755
index 2f8989c5ae..0000000000
--- a/ompi/mpi/fortran/use-mpi-tkr/scripts/mpi_win_create_f90.f90.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2012      FUJITSU LIMITED.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-#
-# This file generates a Fortran code to bridge between an explicit F90
-# generic interface and the F77 implementation.
-#
-# This file is automatically generated by either of the scripts
-#   ../xml/create_mpi_f90_medium.f90.sh or
-#   ../xml/create_mpi_f90_large.f90.sh
-#
-
-. "$1/fortran_kinds.sh"
-
-# This entire file is only generated in medium/large modules.  So if
-# we're not at least medium, bail now.
-
-check_size medium
-if test "$output" = "0"; then
-    exit 0
-fi
-
-# Ok, we should continue.
-
-allranks="0 $ranks"
-
-
-output() {
-    procedure=$1
-    rank=$2
-    type=$4
-    proc="$1$2D$3"
-
-    cat <<EOF
-
-subroutine ${proc}(base, size, disp_unit, info, comm, &
-        win, ierror)
-  include "mpif-config.h"
-  ${type}, intent(in) :: base
-  integer(kind=MPI_ADDRESS_KIND), intent(in) :: size
-  integer, intent(in) :: disp_unit
-  integer, intent(in) :: info
-  integer, intent(in) :: comm
-  integer, intent(out) :: win
-  integer, intent(out) :: ierror
-  call ${procedure}(base, size, disp_unit, info, comm, &
-        win, ierror)
-end subroutine ${proc}
-
-EOF
-}
-
-for rank in $allranks
-do
-  case "$rank" in  0)  dim=''  ;  esac
-  case "$rank" in  1)  dim=', dimension(*)'  ;  esac
-  case "$rank" in  2)  dim=', dimension(1,*)'  ;  esac
-  case "$rank" in  3)  dim=', dimension(1,1,*)'  ;  esac
-  case "$rank" in  4)  dim=', dimension(1,1,1,*)'  ;  esac
-  case "$rank" in  5)  dim=', dimension(1,1,1,1,*)'  ;  esac
-  case "$rank" in  6)  dim=', dimension(1,1,1,1,1,*)'  ;  esac
-  case "$rank" in  7)  dim=', dimension(1,1,1,1,1,1,*)'  ;  esac
-
-  output MPI_Win_create ${rank} CH "character${dim}"
-  output MPI_Win_create ${rank} L "logical${dim}"
-  for kind in $ikinds
-  do
-    output MPI_Win_create ${rank} I${kind} "integer*${kind}${dim}"
-  done
-  for kind in $rkinds
-  do
-    output MPI_Win_create ${rank} R${kind} "real*${kind}${dim}"
-  done
-  for kind in $ckinds
-  do
-    output MPI_Win_create ${rank} C${kind} "complex*${kind}${dim}"
-  done
-done