diff --git a/ChangeLog b/ChangeLog
index 40502525bf..a97871343b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct  1 22:54:09 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/rexml/parsers/lightparser.rb, lib/debug.rb: remove unused when
+	  clauses.
+
 Wed Oct  1 22:43:59 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* lib/xmlrpc, lib/rexml, test/ruby/test_array.rb,
diff --git a/lib/debug.rb b/lib/debug.rb
index 8a2f4f1a12..77be345a07 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -711,9 +711,6 @@ EOHELP
       end
       @frames.shift
 
-    when 'end'
-      @frames.shift
-
     when 'raise' 
       excn_handle(file, line, id, binding)
 
diff --git a/lib/rexml/parsers/lightparser.rb b/lib/rexml/parsers/lightparser.rb
index 6993aba254..ca9692c449 100644
--- a/lib/rexml/parsers/lightparser.rb
+++ b/lib/rexml/parsers/lightparser.rb
@@ -26,8 +26,6 @@ module REXML
           case event[0]
           when :end_document
             break
-          when :end_doctype
-            context = context[1]
           when :start_element, :start_doctype
             new_node = event
             context << new_node