diff --git a/contrib/babel/langs/ob-oz.el b/contrib/babel/langs/ob-oz.el
index d11e9a036..b8c416f4e 100644
--- a/contrib/babel/langs/ob-oz.el
+++ b/contrib/babel/langs/ob-oz.el
@@ -92,14 +92,6 @@
 ;;; major mode for editing Oz programs
 (require 'mozart)
 
-;; Add Oz to the list of supported languages.  Org-babel will match
-;; the string below against the declared language of the source-code
-;; block.
-(org-babel-add-interpreter "oz")
-
-;; specify the name and file extension for Oz
-(add-to-list 'org-babel-tangle-langs '("oz" "oz" nil nil))
-
 ;;
 ;; Interface to communicate with Oz.
 ;; (1) For statements without any results: oz-send-string 
diff --git a/lisp/babel/langs/ob-C.el b/lisp/babel/langs/ob-C.el
index f84b1d47f..0feee6c50 100644
--- a/lisp/babel/langs/ob-C.el
+++ b/lisp/babel/langs/ob-C.el
@@ -36,12 +36,6 @@
 (require 'ob)
 (require 'cc-mode)
 
-(org-babel-add-interpreter "C")
-(add-to-list 'org-babel-tangle-langs '("C" "c" nil))
-
-(org-babel-add-interpreter "c++")
-(add-to-list 'org-babel-tangle-langs '("c++" "cpp" nil))
-
 (defvar org-babel-C-compiler "gcc"
   "Command used to compile a C source code file into an
   executable.")
diff --git a/lisp/babel/langs/ob-R.el b/lisp/babel/langs/ob-R.el
index 0b6e2d2cf..c3e63d421 100644
--- a/lisp/babel/langs/ob-R.el
+++ b/lisp/babel/langs/ob-R.el
@@ -31,10 +31,6 @@
 ;;; Code:
 (require 'ob)
 
-(org-babel-add-interpreter "R")
-
-(add-to-list 'org-babel-tangle-langs '("R" "R" "#!/usr/bin/env Rscript"))
-
 (defconst org-babel-header-arg-names:R
   '(width height bg units pointsize antialias quality compression
 	  res type family title fonts version paper encoding
diff --git a/lisp/babel/langs/ob-asymptote.el b/lisp/babel/langs/ob-asymptote.el
index 9cb902207..53b42bfd4 100644
--- a/lisp/babel/langs/ob-asymptote.el
+++ b/lisp/babel/langs/ob-asymptote.el
@@ -47,10 +47,6 @@
 ;;; Code:
 (require 'ob)
 
-(org-babel-add-interpreter "asymptote")
-
-(add-to-list 'org-babel-tangle-langs '("asymptote" "asymptote"))
-
 (defvar org-babel-default-header-args:asymptote
   '((:results . "file") (:exports . "results"))
   "Default arguments to use when evaluating a asymptote source block.")
diff --git a/lisp/babel/langs/ob-clojure.el b/lisp/babel/langs/ob-clojure.el
index b58d335ad..1a2af9428 100644
--- a/lisp/babel/langs/ob-clojure.el
+++ b/lisp/babel/langs/ob-clojure.el
@@ -45,11 +45,6 @@
 (require 'slime)
 (require 'swank-clojure)
 
-
-(org-babel-add-interpreter "clojure")
-
-(add-to-list 'org-babel-tangle-langs '("clojure" "clj"))
-
 (defvar org-babel-clojure-wrapper-method
   "
 (defn spit
diff --git a/lisp/babel/langs/ob-css.el b/lisp/babel/langs/ob-css.el
index 29618177a..525215dc8 100644
--- a/lisp/babel/langs/ob-css.el
+++ b/lisp/babel/langs/ob-css.el
@@ -32,10 +32,6 @@
 ;;; Code:
 (require 'ob)
 
-(org-babel-add-interpreter "css")
-
-(add-to-list 'org-babel-tangle-langs '("css" "css" nil t))
-
 (defun org-babel-expand-body:css (body params &optional processed-params)
   "Expand BODY according to PARAMS, return the expanded body." body)
 
diff --git a/lisp/babel/langs/ob-ditaa.el b/lisp/babel/langs/ob-ditaa.el
index 5303a2049..e7c04750b 100644
--- a/lisp/babel/langs/ob-ditaa.el
+++ b/lisp/babel/langs/ob-ditaa.el
@@ -41,10 +41,6 @@
 ;;; Code:
 (require 'ob)
 
-(org-babel-add-interpreter "ditaa")
-
-(add-to-list 'org-babel-tangle-langs '("ditaa" "ditaa"))
-
 (defvar org-babel-default-header-args:ditaa
   '((:results . "file") (:exports . "results"))
   "Default arguments to use when evaluating a ditaa source block.")
diff --git a/lisp/babel/langs/ob-dot.el b/lisp/babel/langs/ob-dot.el
index 3e85088dd..0a8376796 100644
--- a/lisp/babel/langs/ob-dot.el
+++ b/lisp/babel/langs/ob-dot.el
@@ -43,10 +43,6 @@
 ;;; Code:
 (require 'ob)
 
-(org-babel-add-interpreter "dot")
-
-(add-to-list 'org-babel-tangle-langs '("dot" "dot"))
-
 (defvar org-babel-default-header-args:dot '((:results . "file") (:exports . "results"))
   "Default arguments to use when evaluating a dot source block.")
 
diff --git a/lisp/babel/langs/ob-emacs-lisp.el b/lisp/babel/langs/ob-emacs-lisp.el
index e22c06868..c1c9da2c3 100644
--- a/lisp/babel/langs/ob-emacs-lisp.el
+++ b/lisp/babel/langs/ob-emacs-lisp.el
@@ -31,10 +31,6 @@
 ;;; Code:
 (require 'ob)
 
-(org-babel-add-interpreter "emacs-lisp")
-
-(add-to-list 'org-babel-tangle-langs '("emacs-lisp" "el"))
-
 (defvar org-babel-default-header-args:emacs-lisp
   '((:hlines . "yes") (:colnames . "no"))
   "Default arguments to use when evaluating an emacs-lisp source block.")
diff --git a/lisp/babel/langs/ob-gnuplot.el b/lisp/babel/langs/ob-gnuplot.el
index 380be7924..e11466377 100644
--- a/lisp/babel/langs/ob-gnuplot.el
+++ b/lisp/babel/langs/ob-gnuplot.el
@@ -44,10 +44,6 @@
 (require 'ob)
 (require 'gnuplot)
 
-(org-babel-add-interpreter "gnuplot")
-
-(add-to-list 'org-babel-tangle-langs '("gnuplot" "gnuplot"))
-
 (defvar org-babel-default-header-args:gnuplot
   '((:results . "file") (:exports . "results") (:session . nil))
   "Default arguments to use when evaluating a gnuplot source block.")
diff --git a/lisp/babel/langs/ob-haskell.el b/lisp/babel/langs/ob-haskell.el
index 2b24822d5..d35ab2be8 100644
--- a/lisp/babel/langs/ob-haskell.el
+++ b/lisp/babel/langs/ob-haskell.el
@@ -46,10 +46,6 @@
 (require 'haskell-mode)
 (require 'inf-haskell)
 
-(org-babel-add-interpreter "haskell")
-
-(add-to-list 'org-babel-tangle-langs '("haskell" "hs"))
-
 (defvar org-babel-haskell-lhs2tex-command "lhs2tex")
 
 (defvar org-babel-haskell-eoe "\"org-babel-haskell-eoe\"")
diff --git a/lisp/babel/langs/ob-latex.el b/lisp/babel/langs/ob-latex.el
index 950ed9a52..b6353bf6b 100644
--- a/lisp/babel/langs/ob-latex.el
+++ b/lisp/babel/langs/ob-latex.el
@@ -35,10 +35,6 @@
 ;;; Code:
 (require 'ob)
 
-(org-babel-add-interpreter "latex")
-
-(add-to-list 'org-babel-tangle-langs '("latex" "tex"))
-
 (defvar org-babel-default-header-args:latex
   '((:results . "latex") (:exports . "results"))
   "Default arguments to use when evaluating a latex source block.")
diff --git a/lisp/babel/langs/ob-matlab.el b/lisp/babel/langs/ob-matlab.el
index 806965fe7..fff035f60 100644
--- a/lisp/babel/langs/ob-matlab.el
+++ b/lisp/babel/langs/ob-matlab.el
@@ -41,10 +41,6 @@
 (require 'matlab)
 (require 'ob-octave)
 
-(org-babel-add-interpreter "matlab")
-(add-to-list 'org-babel-tangle-langs '("matlab" "m" "#!/usr/bin/env matlab"))
-
-
 (defvar org-babel-matlab-shell-command "matlab -nosplash"
   "Shell command to use to run matlab as an external process.")
 
diff --git a/lisp/babel/langs/ob-ocaml.el b/lisp/babel/langs/ob-ocaml.el
index 945b67fb8..7284cf970 100644
--- a/lisp/babel/langs/ob-ocaml.el
+++ b/lisp/babel/langs/ob-ocaml.el
@@ -41,10 +41,6 @@
 (require 'ob)
 (require 'tuareg)
 
-(org-babel-add-interpreter "ocaml")
-
-(add-to-list 'org-babel-tangle-langs '("ocaml" "ml"))
-
 (defvar org-babel-ocaml-eoe-indicator "\"org-babel-ocaml-eoe\";;")
 (defvar org-babel-ocaml-eoe-output "org-babel-ocaml-eoe")
 
diff --git a/lisp/babel/langs/ob-octave.el b/lisp/babel/langs/ob-octave.el
index 2f0713800..f01337243 100644
--- a/lisp/babel/langs/ob-octave.el
+++ b/lisp/babel/langs/ob-octave.el
@@ -35,9 +35,6 @@
 (require 'ob)
 (require 'octave-inf)
 
-(org-babel-add-interpreter "octave")
-(add-to-list 'org-babel-tangle-langs '("octave" "m" "#!/usr/bin/env octave"))
-
 (defvar org-babel-octave-shell-command "octave -q"
   "Shell command to use to run octave as an external process.")
 
diff --git a/lisp/babel/langs/ob-perl.el b/lisp/babel/langs/ob-perl.el
index 7104fbd72..1ac7b9479 100644
--- a/lisp/babel/langs/ob-perl.el
+++ b/lisp/babel/langs/ob-perl.el
@@ -31,10 +31,6 @@
 ;;; Code:
 (require 'ob)
 
-(org-babel-add-interpreter "perl")
-
-(add-to-list 'org-babel-tangle-langs '("perl" "pl" "#!/usr/bin/env perl"))
-
 (defun org-babel-expand-body:perl (body params &optional processed-params)
   "Expand BODY according to PARAMS, return the expanded body."
   (let ((vars (second (or processed-params (org-babel-process-params params)))))
diff --git a/lisp/babel/langs/ob-python.el b/lisp/babel/langs/ob-python.el
index 4f51bb78e..4f3a65acd 100644
--- a/lisp/babel/langs/ob-python.el
+++ b/lisp/babel/langs/ob-python.el
@@ -34,10 +34,6 @@
 (require 'ob-comint)
 (require (if (featurep 'xemacs) 'python-mode 'python))
 
-(org-babel-add-interpreter "python")
-
-(add-to-list 'org-babel-tangle-langs '("python" "py" "#!/usr/bin/env python"))
-
 (defun org-babel-expand-body:python (body params &optional processed-params)
   "Expand BODY according to PARAMS, return the expanded body."
   (concat
diff --git a/lisp/babel/langs/ob-ruby.el b/lisp/babel/langs/ob-ruby.el
index ef9f3d2fe..0b7db58ee 100644
--- a/lisp/babel/langs/ob-ruby.el
+++ b/lisp/babel/langs/ob-ruby.el
@@ -42,10 +42,6 @@
 (require 'ob)
 (require 'inf-ruby)
 
-(org-babel-add-interpreter "ruby")
-
-(add-to-list 'org-babel-tangle-langs '("ruby" "rb" "#!/usr/bin/env ruby"))
-
 (defun org-babel-expand-body:ruby (body params &optional processed-params)
   "Expand BODY according to PARAMS, return the expanded body."
   (let ((vars (second (or processed-params (org-babel-process-params params)))))
diff --git a/lisp/babel/langs/ob-sass.el b/lisp/babel/langs/ob-sass.el
index a8114fa49..58ece16e1 100644
--- a/lisp/babel/langs/ob-sass.el
+++ b/lisp/babel/langs/ob-sass.el
@@ -44,10 +44,6 @@
 (require 'ob)
 (require 'sass-mode)
 
-(org-babel-add-interpreter "sass")
-
-(add-to-list 'org-babel-tangle-langs '("sass" "sass"))
-
 (defun org-babel-expand-body:sass (body params &optional processed-params)
   "Expand BODY according to PARAMS, return the expanded body." body)
 
diff --git a/lisp/babel/langs/ob-screen.el b/lisp/babel/langs/ob-screen.el
index dadb39a86..8c690e89d 100644
--- a/lisp/babel/langs/ob-screen.el
+++ b/lisp/babel/langs/ob-screen.el
@@ -38,10 +38,6 @@
 ;;; Code:
 (require 'ob)
 
-(org-babel-add-interpreter "screen")
-
-(add-to-list 'org-src-lang-modes '("screen" . sh))
-
 (defvar org-babel-screen-location "screen"
   "The command location for screen. 
 In case you want to use a different screen than one selected by your $PATH")
diff --git a/lisp/babel/langs/ob-sh.el b/lisp/babel/langs/ob-sh.el
index 089c23913..4b18ad14c 100644
--- a/lisp/babel/langs/ob-sh.el
+++ b/lisp/babel/langs/ob-sh.el
@@ -41,10 +41,6 @@
 (declare-function org-babel-comint-with-output "ob-comint" (meta &rest body))
 (declare-function orgtbl-to-generic "org-table" (table params))
 
-(org-babel-add-interpreter "sh")
-
-(add-to-list 'org-babel-tangle-langs '("sh" "sh" "#!/usr/bin/env sh"))
-
 (defvar org-babel-sh-command "sh"
   "Command used to invoke a shell.  This will be passed to
   `shell-command-on-region'")
diff --git a/lisp/babel/langs/ob-sql.el b/lisp/babel/langs/ob-sql.el
index cdbbbc5df..f48f1a577 100644
--- a/lisp/babel/langs/ob-sql.el
+++ b/lisp/babel/langs/ob-sql.el
@@ -47,10 +47,6 @@
 ;;; Code:
 (require 'ob)
 
-(org-babel-add-interpreter "sql")
-
-(add-to-list 'org-babel-tangle-langs '("sql" "sql"))
-
 (defun org-babel-expand-body:sql (body params &optional processed-params)
   "Expand BODY according to PARAMS, return the expanded body." body)
 
diff --git a/lisp/babel/langs/ob-sqlite.el b/lisp/babel/langs/ob-sqlite.el
index fa95b3f33..d2331e710 100644
--- a/lisp/babel/langs/ob-sqlite.el
+++ b/lisp/babel/langs/ob-sqlite.el
@@ -31,10 +31,6 @@
 ;;; Code:
 (require 'ob)
 
-(org-babel-add-interpreter "sqlite")
-
-(add-to-list 'org-babel-tangle-langs '("sqlite" "sqlite"))
-
 (defun org-babel-expand-body:sqlite
   (body params &optional processed-params) body)