2 files changed, 5 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index f4208d61fb..79394015b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu May  2 22:11:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bin/irb: remove dead code from sample/irb.rb.
+
 Thu May  2 17:32:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* marshal.c (copy_ivar_i): get rid of overwriting already copied
diff --git a/bin/irb b/bin/irb
index 6c8465c802..c64ee85fbd 100755
--- a/bin/irb
+++ b/bin/irb
@@ -8,13 +8,4 @@
 
 require "irb"
 
-if __FILE__ == $0
-  IRB.start(__FILE__)
-else
-  # check -e option
-  if /^-e$/ =~ $0
-    IRB.start(__FILE__)
-  else
-    IRB.setup(__FILE__)
-  end
-end
+IRB.start(__FILE__)