9 files changed, 2 insertions, 33 deletions
diff --git a/contrib/extraction/test/custom/Adalloc b/contrib/extraction/test/custom/Adalloc
index 11cabe4f45..2c2ec8af87 100644
--- a/contrib/extraction/test/custom/Adalloc
+++ b/contrib/extraction/test/custom/Adalloc
@@ -1,4 +1,2 @@
 Require Addr.
 Extraction NoInline ad_double ad_double_plus_un.
-Require Map.
-Extraction Inline Map_rec Map_rect.
diff --git a/contrib/extraction/test/custom/Fset b/contrib/extraction/test/custom/Fset
deleted file mode 100644
index cb2aa88684..0000000000
--- a/contrib/extraction/test/custom/Fset
+++ /dev/null
@@ -1,2 +0,0 @@
-Require Map.
-Extraction Inline Map_rec Map_rect.
diff --git a/contrib/extraction/test/custom/Lsort b/contrib/extraction/test/custom/Lsort
index ef57348fbc..41c9db2868 100644
--- a/contrib/extraction/test/custom/Lsort
+++ b/contrib/extraction/test/custom/Lsort
@@ -1,4 +1,2 @@
 Require Addr. 
 Extraction NoInline ad_double ad_double_plus_un.
-Require Map.
-Extraction Inline Map_rec Map_rect.
diff --git a/contrib/extraction/test/custom/Mapcard b/contrib/extraction/test/custom/Mapcard
index 71496aba98..78c382267b 100644
--- a/contrib/extraction/test/custom/Mapcard
+++ b/contrib/extraction/test/custom/Mapcard
@@ -2,5 +2,3 @@ Require Plus.
 Extraction NoInline plus_is_one.
 Require Addr.
 Extraction NoInline ad_double ad_double_plus_un.
-Require Map.
-Extraction Inline Map_rec Map_rect.
diff --git a/contrib/extraction/test/custom/Mapiter b/contrib/extraction/test/custom/Mapiter
index ef57348fbc..41c9db2868 100644
--- a/contrib/extraction/test/custom/Mapiter
+++ b/contrib/extraction/test/custom/Mapiter
@@ -1,4 +1,2 @@
 Require Addr. 
 Extraction NoInline ad_double ad_double_plus_un.
-Require Map.
-Extraction Inline Map_rec Map_rect.
diff --git a/contrib/extraction/test/custom/all b/contrib/extraction/test/custom/all
deleted file mode 100644
index e69de29bb2..0000000000
--- a/contrib/extraction/test/custom/all
+++ /dev/null
diff --git a/contrib/extraction/test/extract b/contrib/extraction/test/extract
index ea85582dff..2b96f354f7 100755
--- a/contrib/extraction/test/extract
+++ b/contrib/extraction/test/extract
@@ -3,8 +3,7 @@ rm -f /tmp/extr$$.v
 vfile=`./ml2v $1`
 d=`dirname $vfile`
 n=`basename $vfile .v`
-cat custom/all > /tmp/extr$$.v
-if [ -e custom/$n ]; then cat custom/$n >> /tmp/extr$$.v; fi  
+if [ -e custom/$n ]; then cat custom/$n > /tmp/extr$$.v; fi  
 echo "Cd \"$d\". Extraction Module $n. " >> /tmp/extr$$.v
 ../../../bin/coqtop.opt -silent -batch -require $n -load-vernac-source /tmp/extr$$.v 
 out=$?
diff --git a/contrib/extraction/test/extract.haskell b/contrib/extraction/test/extract.haskell
index 84cde78d47..3f4a59d490 100755
--- a/contrib/extraction/test/extract.haskell
+++ b/contrib/extraction/test/extract.haskell
@@ -3,8 +3,7 @@ rm -f /tmp/extr$$.v
 vfile=`./hs2v $1`
 d=`dirname $vfile`
 n=`basename $vfile .v`
-cat custom/all > /tmp/extr$$.v
-if [ -e custom/$n ]; then cat custom/$n >> /tmp/extr$$.v; fi  
+if [ -e custom/$n ]; then cat custom/$n > /tmp/extr$$.v; fi  
 echo "Cd \"$d\". Extraction Language Haskell. Extraction Module $n. " >> /tmp/extr$$.v
 ../../../bin/coqtop.opt -silent -batch -require $n -load-vernac-source /tmp/extr$$.v 
 out=$?
diff --git a/contrib/extraction/test/qualify2open b/contrib/extraction/test/qualify2open
deleted file mode 100755
index 48b381d1c1..0000000000
--- a/contrib/extraction/test/qualify2open
+++ /dev/null
@@ -1,19 +0,0 @@
-#/bin/sh
-
-mv $1 $1.orig
-
-touch $1
-
-awk '{ s = $0 						
-   do { 						
-   match(s,"[A-Z][a-zA-Z0-9_]*\\.") 
-   if (RLENGTH>0) 			
-     printf("open %s\n",substr(s,RSTART,RLENGTH-1)) 	
-   s = substr(s,RSTART+RLENGTH)			
-  } while (RLENGTH>0)}' $1.orig | sort | uniq >> $1
-
-echo >> $1
-
-awk '{ gsub("[A-Z][a-zA-Z0-9_]*\\.","")  
-       print $0}' $1.orig >> $1
-