diff --git a/koans/autotest/discover.rb b/koans/autotest/discover.rb
deleted file mode 100644
index 31a7804..0000000
--- a/koans/autotest/discover.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-Autotest.add_discovery do
-  "rubykoan" if File.exist? 'path_to_enlightenment.rb'
-end
diff --git a/koans/autotest/rubykoan.rb b/koans/autotest/rubykoan.rb
deleted file mode 100644
index d43dc91..0000000
--- a/koans/autotest/rubykoan.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'autotest'
-
-class Autotest::Rubykoan < Autotest
-  def initialize
-    super
-    @exceptions = /\.txt|Rakefile|\.rdoc/
-
-    self.order = :alpha
-    self.add_mapping(/^about_.*rb$/) do |filename, _|
-      filename
-    end 
-
-  end
-
-  def make_test_cmd files_to_test
-    "#{ruby}  'path_to_enlightenment.rb'"
-  end 
-
-  # quiet test/unit chatter
-  def handle_results(results)
-  end
-
-end
-
diff --git a/koans/edgecase.rb b/koans/edgecase.rb
index add1aa7..8cf180b 100644
--- a/koans/edgecase.rb
+++ b/koans/edgecase.rb
@@ -43,7 +43,6 @@ class Object
 end
 
 module EdgeCase
-
   module Color
     #shamelessly stolen (and modified) from redgreen
     COLORS = { :clear => 0, :red => 31, :green => 32, :yellow => 33, :blue => 34, :magenta => 35, :cyan => 36 }
@@ -89,9 +88,9 @@ module EdgeCase
     def accumulate(test)
       if test.passed?
         @pass_count += 1
-        puts Color.green("  #{test.name} has expanded your awareness.")
+        puts "  #{test.name} has expanded your awareness."
       else
-        puts Color.red("  #{test.name} has damaged your karma.")
+        puts "  #{test.name} has damaged your karma."
         @failed_test = test
         @failure = test.failure
         throw :edgecase_exit
@@ -109,19 +108,18 @@ module EdgeCase
     def report
       if failed?
         puts
-        puts Color.green("You have not yet reached enlightenment ...")
-        puts Color.red(failure.message)
+        puts "You have not yet reached enlightenment ..."
+        puts failure.message
         puts
-        puts Color.green("Please meditate on the following code:")
+        puts "Please meditate on the following code:"
         if assert_failed?
-          #puts find_interesting_lines(failure.backtrace)
-          puts find_interesting_lines(failure.backtrace).collect {|l| Color.red(l) }
+          puts find_interesting_lines(failure.backtrace)
         else
-          puts Color.red(failure.backtrace)
+          puts failure.backtrace
         end
         puts
       end
-      puts Color.green(say_something_zenlike)
+      say_something_zenlike
     end
 
     def find_interesting_lines(backtrace)
@@ -135,24 +133,23 @@ module EdgeCase
     def say_something_zenlike
       puts
       if !failed?
-        zen_statement =  "Mountains are again merely mountains"
+        puts "Mountains are again merely mountains"
       else
-        zen_statement = case (@pass_count % 10)
+        case (@pass_count % 10)
         when 0
-          "mountains are merely mountains"
+          puts "mountains are merely mountains"
         when 1, 2
-          "learn the rules so you know how to break them properly"
+          puts "learn the rules so you know how to break them properly"
         when 3, 4
-          "remember that silence is sometimes the best answer"
+          puts "remember that silence is sometimes the best answer"
         when 5, 6
-          "sleep is the best meditation"
+          puts "sleep is the best meditation"
         when 7, 8
-          "when you lose, don't lose the lesson"
+          puts "when you lose, don't lose the lesson"
         else
-          "things are not what they appear to be: nor are they otherwise"
+          puts "things are not what they appear to be: nor are they otherwise"
         end
       end
-      zen_statement
     end
   end
 
@@ -192,7 +189,7 @@ module EdgeCase
 
       def run_tests(accumulator)
         puts
-        puts Color.green("Thinking #{self}")
+        puts "Thinking #{self}"
         testmethods.each do |m|
           self.run_test(m, accumulator) if Koan.test_pattern =~ m.to_s
         end