diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 4fd6d683874f4d099160c96db9903e6c5b74a60e..501552cdec3d52f4be13ad0ae0a9cf051938d955 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,6 @@
 Zen 6.x-1.x-dev
   * Upgrading to Drupal 6. Not yet complete.
+  #229661: earch Box doesn't return any results or warnings
   #244023 by jjeff: Make block editing links go to actual menu edit pages
   #245968 by jjeff: Put the word "Comments" above comments
   #238387: Update README on how to edit the .info file
diff --git a/STARTERKIT/template.php b/STARTERKIT/template.php
index 727f1e1b7debb07b6f927fb68a9281662f84efcd..b7bc2a1c429739933944885c8499be8fc86bded1 100644
--- a/STARTERKIT/template.php
+++ b/STARTERKIT/template.php
@@ -41,7 +41,7 @@ include_once 'theme-settings-init.php';
  */
 
 // Optionally add a fixed width CSS file.
-/* -- Delete this line if you want to use this code
+/* -- Delete this line if you want to use and modify this code
 if (theme_get_setting('STARTERKIT_fixed')) {
   drupal_add_css(path_to_theme() .'/layout-fixed.css', 'theme', 'all');
 }
@@ -127,17 +127,6 @@ function STARTERKIT_preprocess_block(&$vars) {
 // */
 
 
-/**
- * Override the Drupal search form using the search-theme-form.tpl.php file.
- *
- * @TODO Fix this functionality; this function is totally broken in D6.
- */
-/* -- Delete this line if you want to use this function
-function STARTERKIT_search_theme_form($form) {
-  return _phptemplate_callback('search_theme_form', array('form' => $form), array('search-theme-form'));
-}
-// */
-
 /**
  * Fixes broken calls to l() in Drupal's (6.0-6.2) theme_username().
  */
diff --git a/zen/search-theme-form.tpl.php b/zen/search-theme-form.tpl.php
deleted file mode 100644
index 879b450ec8761c1ac206669cee0394dffb30c944..0000000000000000000000000000000000000000
--- a/zen/search-theme-form.tpl.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="search" class="container-inline">
-  <div class="form-item">
-    <input type="text" maxlength="128" name="search_theme_form_keys" id="edit-search-theme-form-keys"  size="15" value="" title="<?php print t('Enter the terms you wish to search for.'); ?>" class="form-text" />
-  </div>
-  <input type="submit" name="op" id="edit-submit" value="<?php print t('Search'); ?>"  class="form-submit" />
-  <input type="hidden" name="form_token" id="edit-search-theme-form-form-token" value="<?php print drupal_get_token('search_theme_form'); ?>"  />
-  <input type="hidden" name="form_id" id="edit-search-theme-form" value="search_theme_form"  />
-</div>
diff --git a/zen_classic/template.php b/zen_classic/template.php
index 84fa06cce123ff28bfe82cfb1b9e0dab1ab8dc94..9aab333220a8af90f2504f5d27898a1523a7ec62 100644
--- a/zen_classic/template.php
+++ b/zen_classic/template.php
@@ -125,17 +125,6 @@ function zen_classic_preprocess_block(&$vars) {
 // */
 
 
-/**
- * Override the Drupal search form using the search-theme-form.tpl.php file.
- *
- * @TODO Fix this functionality; this function is totally broken in D6.
- */
-/* -- Delete this line if you want to use this function
-function zen_classic_search_theme_form($form) {
-  return _phptemplate_callback('search_theme_form', array('form' => $form), array('search-theme-form'));
-}
-// */
-
 /**
  * Fixes broken calls to l() in Drupal's (6.0-6.2) theme_username().
  */