diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index b307ab910c3e4e12115bf4b486011af43e5b37db..2e5b316f77272766b6869a4be12c3c0dccd065bd 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -450,7 +450,6 @@ function bootstrap_invoke_all($op) {
  *   TRUE if the item is loaded or has already been loaded.
  */
 function drupal_load($type, $name) {
-  // print $name. '<br />';
   static $files = array();
 
   if (isset($files[$type][$name])) {
diff --git a/modules/comment.module b/modules/comment.module
index 504680fb4c9bdbbd405cf742ba367174c3f4f5a4..fa3a984438b41eb040cd9a1177785177af58a731 100644
--- a/modules/comment.module
+++ b/modules/comment.module
@@ -1676,7 +1676,6 @@ function _comment_update_node_statistics($nid) {
 
   // comments exist
   if ($count > 0) {
-    $node = node_load($nid);
     $last_reply = db_fetch_object(db_query_range('SELECT cid, name, timestamp, uid FROM {comments} WHERE nid = %d AND status = %d ORDER BY cid DESC', $nid, COMMENT_PUBLISHED, 0, 1));
     db_query("UPDATE {node_comment_statistics} SET comment_count = %d, last_comment_timestamp = %d, last_comment_name = '%s', last_comment_uid = %d WHERE nid = %d", $count, $last_reply->timestamp, $last_reply->uid ? NULL : $last_reply->name, $last_reply->uid, $nid);
   }
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 504680fb4c9bdbbd405cf742ba367174c3f4f5a4..fa3a984438b41eb040cd9a1177785177af58a731 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -1676,7 +1676,6 @@ function _comment_update_node_statistics($nid) {
 
   // comments exist
   if ($count > 0) {
-    $node = node_load($nid);
     $last_reply = db_fetch_object(db_query_range('SELECT cid, name, timestamp, uid FROM {comments} WHERE nid = %d AND status = %d ORDER BY cid DESC', $nid, COMMENT_PUBLISHED, 0, 1));
     db_query("UPDATE {node_comment_statistics} SET comment_count = %d, last_comment_timestamp = %d, last_comment_name = '%s', last_comment_uid = %d WHERE nid = %d", $count, $last_reply->timestamp, $last_reply->uid ? NULL : $last_reply->name, $last_reply->uid, $nid);
   }
diff --git a/modules/search.module b/modules/search.module
index 177ac74f17d11ee60d90c92572f97e47d33ad4ac..dafd498ee394bd5efd3fc4a4dcb22e7c3d8d6a35 100644
--- a/modules/search.module
+++ b/modules/search.module
@@ -648,9 +648,6 @@ function search_form($action = '', $keys = '', $type = null, $prompt = null) {
   if (!$action) {
     $action = url('search/'. $type);
   }
-  if (!$type) {
-    $type = 'node';
-  }
   if (is_null($prompt)) {
     $prompt = t('Enter your keywords');
   }
diff --git a/modules/search/search.module b/modules/search/search.module
index 177ac74f17d11ee60d90c92572f97e47d33ad4ac..dafd498ee394bd5efd3fc4a4dcb22e7c3d8d6a35 100644
--- a/modules/search/search.module
+++ b/modules/search/search.module
@@ -648,9 +648,6 @@ function search_form($action = '', $keys = '', $type = null, $prompt = null) {
   if (!$action) {
     $action = url('search/'. $type);
   }
-  if (!$type) {
-    $type = 'node';
-  }
   if (is_null($prompt)) {
     $prompt = t('Enter your keywords');
   }