9 files changed, 19 insertions, 38 deletions
diff --git a/src/clojure/contrib/duck_streams/duck_streams.clj b/src/clojure/contrib/duck_streams/duck_streams.clj
index 855e8db5..b3d6765a 100644
--- a/src/clojure/contrib/duck_streams/duck_streams.clj
+++ b/src/clojure/contrib/duck_streams/duck_streams.clj
@@ -25,13 +25,12 @@
 ;; of 'slurp') and 'write-lines' (opposite of 'line-seq').
 
 
-(clojure/in-ns 'clojure.contrib.duck-streams)
-(clojure/refer 'clojure)
-
-(import '(java.io Reader InputStream InputStreamReader FileReader
-		  BufferedReader File PrintWriter OutputStream
-		  OutputStreamWriter BufferedWriter Writer FileWriter)
-	'(java.net URI URL MalformedURLException))
+(clojure/ns clojure.contrib.duck-streams
+            (:import 
+             (java.io Reader InputStream InputStreamReader FileReader
+                      BufferedReader File PrintWriter OutputStream
+                      OutputStreamWriter BufferedWriter Writer FileWriter)
+             (java.net URI URL MalformedURLException)))
 
 (defmacro bufr
   {:private true}
diff --git a/src/clojure/contrib/enum/enum.clj b/src/clojure/contrib/enum/enum.clj
index b417028d..33ca2d23 100644
--- a/src/clojure/contrib/enum/enum.clj
+++ b/src/clojure/contrib/enum/enum.clj
@@ -18,8 +18,7 @@
 ;; This file depends on genclass.clj in the Clojure distribution.
 
 
-(clojure/in-ns 'clojure.contrib.enum)
-(clojure/refer 'clojure)
+(clojure/ns clojure.contrib.enum)
 
 (defmacro defenum
   "Generates and loads a subclass of java.lang.Enum, then
diff --git a/src/clojure/contrib/fcase/fcase.clj b/src/clojure/contrib/fcase/fcase.clj
index 8e316f56..f9f919ad 100644
--- a/src/clojure/contrib/fcase/fcase.clj
+++ b/src/clojure/contrib/fcase/fcase.clj
@@ -18,8 +18,7 @@
 ;; test for regular expressions and class membership.
 
 
-(clojure/in-ns 'clojure.contrib.fcase)
-(clojure/refer 'clojure)
+(clojure/ns clojure.contrib.fcase)
 
 
 (defmacro fcase
diff --git a/src/clojure/contrib/import_static/import_static.clj b/src/clojure/contrib/import_static/import_static.clj
index 0aa4364e..44a63236 100644
--- a/src/clojure/contrib/import_static/import_static.clj
+++ b/src/clojure/contrib/import_static/import_static.clj
@@ -13,9 +13,8 @@
 
 
 
-(clojure/in-ns 'clojure.contrib.import-static)
-(clojure/refer 'clojure)
-(clojure/refer 'clojure.set)
+(clojure/ns clojure.contrib.import-static
+            (:use clojure.set))
 
 (defmacro import-static
   "Imports the named static fields and/or static methods of the class
diff --git a/src/clojure/contrib/javalog/javalog.clj b/src/clojure/contrib/javalog/javalog.clj
index 2cb12c48..2282beac 100644
--- a/src/clojure/contrib/javalog/javalog.clj
+++ b/src/clojure/contrib/javalog/javalog.clj
@@ -19,11 +19,10 @@
 
 
 
-(clojure/in-ns 'clojure.contrib.javalog)
-(clojure/refer 'clojure)
-
-(import '(java.util.logging Logger Level ConsoleHandler
-                            FileHandler SimpleFormatter))
+(clojure/ns clojure.contrib.javalog
+            (:import 
+             (java.util.logging Logger Level ConsoleHandler
+                                FileHandler SimpleFormatter)))
 
 (def 
  #^{:tag Logger
diff --git a/src/clojure/contrib/seq_utils/seq_utils.clj b/src/clojure/contrib/seq_utils/seq_utils.clj
index 33f67420..34355b40 100644
--- a/src/clojure/contrib/seq_utils/seq_utils.clj
+++ b/src/clojure/contrib/seq_utils/seq_utils.clj
@@ -12,8 +12,7 @@
 ;; remove this notice, or any other, from this software.
 
 
-(clojure/in-ns 'clojure.contrib.seq-utils)
-(clojure/refer 'clojure)
+(clojure/ns clojure.contrib.seq-utils)
 
 
 ;; 'flatten' written by Rich Hickey,
@@ -25,14 +24,6 @@
   (let [s? #(instance? clojure.lang.Sequential %)]
     (filter (complement s?) (tree-seq s? seq x))))
 
-(defn batch
-  "Returns a sequence of sequences, each containing 'size' elements
-  from s.  DEPRECATED in favor of clojure/partition, added to boot.clj
-  in r865."
-  [size s]
-  (when s
-    (lazy-cons (take size s) (batch size (drop size s)))))
-
 (defn separate
   "Returns a vector:
    [ (filter f s), (filter (complement f) s) ]"
diff --git a/src/clojure/contrib/str_utils/str_utils.clj b/src/clojure/contrib/str_utils/str_utils.clj
index cb344024..213b568a 100644
--- a/src/clojure/contrib/str_utils/str_utils.clj
+++ b/src/clojure/contrib/str_utils/str_utils.clj
@@ -12,11 +12,8 @@
 ;; remove this notice, or any other, from this software.
 
 
-(clojure/in-ns 'clojure.contrib.str-utils)
-(clojure/refer 'clojure)
-
-(import '(java.util.regex Pattern))
-
+(clojure/in-ns clojure.contrib.str-utils
+               (:import (java.util.regex Pattern)))
 
 (defn re-split
   "Splits the string on instances of 'pattern'.  Returns a sequence of
diff --git a/src/clojure/contrib/test_is/test_is.clj b/src/clojure/contrib/test_is/test_is.clj
index 68463393..36a1ce61 100644
--- a/src/clojure/contrib/test_is/test_is.clj
+++ b/src/clojure/contrib/test_is/test_is.clj
@@ -37,8 +37,7 @@
 
 
 
-(clojure/in-ns 'clojure.contrib.test-is)
-(clojure/refer 'clojure)
+(clojure/ns clojure.contrib.test-is)
 
 (def
  #^{:doc "PrintWriter to which test results are printed; defaults to
diff --git a/src/clojure/contrib/trace/trace.clj b/src/clojure/contrib/trace/trace.clj
index 9f91d585..9ba1b671 100644
--- a/src/clojure/contrib/trace/trace.clj
+++ b/src/clojure/contrib/trace/trace.clj
@@ -16,8 +16,7 @@
 ;; code is doing.
 
 
-(clojure/in-ns 'clojure.contrib.trace)
-(clojure/refer 'clojure)
+(clojure/ns clojure.contrib.trace)
 
 (def
  #^{:doc "PrintStream for trace output.  Defaults to System.err."}