diff --git a/wp-admin/index.php b/wp-admin/index.php
index c207955d9..e922f0a86 100644
--- a/wp-admin/index.php
+++ b/wp-admin/index.php
@@ -10,7 +10,7 @@ $today = current_time('mysql', 1);
 
 <div class="wrap">
 
-<h2><?php _e('Dashboard'); ?></h2>
+<h2><?php _e('Welcome to WordPress'); ?></h2>
 
 <div id="zeitgeist">
 <h2><?php _e('Latest Activity'); ?></h2>
@@ -113,8 +113,6 @@ if (0 < $numcats) $numcats = number_format($numcats);
 <?php do_action('activity_box_end'); ?>
 </div>
 
-<h3><?php _e('Welcome to WordPress'); ?></h3>
-
 <p><?php _e('Use these links to get started:'); ?></p>
 
 <ul>
@@ -129,13 +127,12 @@ if (0 < $numcats) $numcats = number_format($numcats);
 	<li><a href="themes.php"><?php _e('Change your site&#8217;s look or theme'); ?></a></li>
 <?php endif; ?>
 </ul>
-
-<p><?php _e("Below is the latest news from the official WordPress development blog, click on a title to read the full entry. If you need help with WordPress please see our <a href='http://codex.wordpress.org/'>great documentation</a> or if that doesn't help visit the <a href='http://wordpress.org/support/'>support forums</a>."); ?></p>
+<p><?php _e("Need help with WordPress? Please see our <a href='http://codex.wordpress.org/'>documentation</a> or visit the <a href='http://wordpress.org/support/'>support forums</a>."); ?></p>
 <?php
 $rss = @fetch_rss('http://wordpress.org/development/feed/');
 if ( isset($rss->items) && 0 != count($rss->items) ) {
 ?>
-<h3><?php _e('WordPress Development Blog'); ?></h3>
+<h3><?php _e('WordPress Development News'); ?></h3>
 <?php
 $rss->items = array_slice($rss->items, 0, 3);
 foreach ($rss->items as $item ) {
diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index 1fcd036e1..16110a896 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -5,23 +5,13 @@ $title = __('Discussion Options');
 $parent_file = 'options-general.php';
 
 include('admin-header.php');
-
-if ($action == 'retrospam') {
-	if ( $_GET['move'] == 'true' ) {
-		retrospam_mgr::move_spam( $_GET[ids] );
-	}
-	$retrospaminator = new retrospam_mgr();
-	$result = $retrospaminator->find_spam();
-	echo $retrospaminator->display_edit_form( $result );
-	include('./admin-footer.php');
-	exit;
-}
 ?>
 
 <div class="wrap"> 
 <h2><?php _e('Discussion Options') ?></h2> 
 <form method="post" action="options.php"> 
 <?php wp_nonce_field('update-options') ?>
+<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
 <fieldset class="options">
 <legend><?php _e('Usual settings for an article:<br /><small><em>(These settings may be overridden for individual articles.)</em></small>') ?></legend> 
 <ul> 
@@ -63,7 +53,7 @@ if ($action == 'retrospam') {
 <li>
 <label for="comment_moderation"> 
 <input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_option('comment_moderation')); ?> /> 
-<?php _e('An administrator must approve the comment (regardless of any matches below)') ?> </label> 
+<?php _e('An administrator must always approve the comment') ?> </label> 
 </li> 
 <li><label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_option('require_name_email')); ?> /> <?php _e('Comment author must fill out name and e-mail') ?></label></li> 
 <li><label for="comment_whitelist"><input type="checkbox" name="comment_whitelist" id="comment_whitelist" value="1" <?php checked('1', get_option('comment_whitelist')); ?> /> <?php _e('Comment author must have a previously approved comment') ?></label></li> 
@@ -73,23 +63,17 @@ if ($action == 'retrospam') {
 <legend><?php _e('Comment Moderation') ?></legend>
 <p><?php printf(__('Hold a comment in the queue if it contains more than %s links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="text" id="comment_max_links" size="3" value="' . get_option('comment_max_links'). '" />' ) ?></p>
 
-<p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, hold it in the moderation queue: (Separate multiple words with new lines.) <a href="http://codex.wordpress.org/Spam_Words">Common spam words</a>.') ?></p>
+<p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the <a href="moderation.php">moderation queue</a>. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></p>
 <p> 
 <textarea name="moderation_keys" cols="60" rows="4" id="moderation_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('moderation_keys'); ?></textarea> 
 </p> 
-<p>
-<a id="retrospambutton" href="options-discussion.php?action=retrospam"><?php _e('Check past comments against moderation list'); ?></a>
-</p> 
 </fieldset>
 <fieldset class="options">
 <legend><?php _e('Comment Blacklist') ?></legend>
-<p><?php _e('This is a list of words that you want completely blacklisted from your blog. Be very careful what you add here, because if a comment matches something here it will be completely nuked and there will be no notification. Remember that partial words can match, so if there is any chance something here might match it would be better to put it in the moderation box above.') ?></p>
+<p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be deleted. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></p>
 <p> 
 <textarea name="blacklist_keys" cols="60" rows="4" id="blacklist_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('blacklist_keys'); ?></textarea> 
 </p>
-<p><label for="open_proxy_check"> 
-<input name="open_proxy_check" type="checkbox" id="open_proxy_check" value="1" <?php checked('1', get_option('open_proxy_check')); ?> /> 
-<?php _e('Blacklist comments from open and insecure proxies.') ?></label></p>
 </fieldset>
 <p class="submit">
 <input type="hidden" name="action" value="update" /> 
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 831dfe941..f6db7502b 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -11,6 +11,7 @@ include('./admin-header.php');
 <h2><?php _e('General Options') ?></h2>
 <form method="post" action="options.php"> 
 <?php wp_nonce_field('update-options') ?>
+<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
 <table class="optiontable"> 
 <tr valign="top"> 
 <th scope="row"><?php _e('Weblog title:') ?></th> 
@@ -64,7 +65,7 @@ include('./admin-header.php');
 <tr>
 <th scope="row"><?php _e('Times in the weblog should differ by:') ?> </th>
 <td><input name="gmt_offset" type="text" id="gmt_offset" size="2" value="<?php form_option('gmt_offset'); ?>" /> 
-<?php _e('hours') ?> </td>
+<?php _e('hours') ?> (<?php _e('Your timezone offset, for example <code>-6</code> for Central Time.'); ?>)</td>
 </tr>
 <tr>
 <th scope="row"><?php _e('Default date format:') ?></th>
diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php
index dbe8a7427..f0c412cc0 100644
--- a/wp-admin/options-misc.php
+++ b/wp-admin/options-misc.php
@@ -12,6 +12,7 @@ include('admin-header.php');
 <h2><?php _e('Miscellaneous Options') ?></h2> 
 <form method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
+<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
 <fieldset class="options">
 <legend><?php _e('Uploading'); ?></legend>
 <table class="editform optiontable">
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index ca1c7a4d4..0b0d7dd37 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -102,6 +102,9 @@ else
 
 <div class="wrap"> 
   <h2><?php _e('Customize Permalink Structure') ?></h2> 
+<form name="form" action="options-permalink.php" method="post"> 
+<?php wp_nonce_field('update-permalink') ?>
+<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
   <p><?php _e('By default WordPress uses web <abbr title="Universal Resource Locator">URL</abbr>s which have question marks and lots of numbers in them, however WordPress offers you the ability to create a custom URL structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="http://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.'); ?></p>
 
 <?php
@@ -116,8 +119,6 @@ $structures = array(
 	$prefix . '/archives/%post_id%'
 	);
 ?>
-<form name="form" action="options-permalink.php" method="post"> 
-<?php wp_nonce_field('update-permalink') ?>
 <h3><?php _e('Common options:'); ?></h3>
 <p>
 	<label>
diff --git a/wp-admin/options-privacy.php b/wp-admin/options-privacy.php
index d91ea1d4d..28e7ecd30 100644
--- a/wp-admin/options-privacy.php
+++ b/wp-admin/options-privacy.php
@@ -15,11 +15,10 @@ include('./admin-header.php');
 <tr valign="top"> 
 <th scope="row"><?php _e('Blog visibility:') ?> </th> 
 <td>
-<input id="blog-public" type="radio" name="blog_public" value="1" <?php checked('1', get_option('blog_public')); ?> />
-	<label for="blog-public"><?php _e('I would like my blog to be visible to anyone who visits, including search engines and archivers') ?></label>
-<br />
-<input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> />
-	<label for="blog-norobots"><?php _e('I would like to block search engines, but allow normal folks') ?></label>
+<p><input id="blog-public" type="radio" name="blog_public" value="1" <?php checked('1', get_option('blog_public')); ?> />
+<label for="blog-public"><?php _e('I would like my blog to be visible to everyone, including search engines (like Google, Sphere, Technorati) and archivers');?></label></p>
+<p><input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> />
+<label for="blog-norobots"><?php _e('I would like to block search engines, but allow normal visitors'); ?></label></p>
 <?php do_action('blog_privacy_selector'); ?>
 </td> 
 </tr>
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index ebca0c43b..84d61448f 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -11,26 +11,27 @@ include('admin-header.php');
 <h2><?php _e('Reading Options') ?></h2> 
 <form name="form1" method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
-
+<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
 <?php if ( get_pages() ): ?>
 <fieldset class="options"> 
 <legend><?php _e('Front Page') ?></legend> 
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
+<table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform"> 
 <tr valign="top"> 
 <th width="33%" scope="row"><?php _e('Front page displays:')?></th> 
 <td>
-	<label>
+	<p><label>
 		<input name="show_on_front" type="radio" value="posts" class="tog" <?php checked('posts', get_option('show_on_front')); ?> /> 
-		<?php _e('The latest posts'); ?>
+		<?php _e('Your latest posts'); ?>
 	</label>
-	<br />
-	<label>
+	</p>
+	<p><label>
 		<input name="show_on_front" type="radio" value="page" class="tog" <?php checked('page', get_option('show_on_front')); ?> /> 
-		<?php printf(__('A static <a href="%s">page</a> (select below)'), 'edit-pages.php'); ?>
+		<?php printf(__('A <a href="%s">static page</a> (select below)'), 'edit-pages.php'); ?>
 	</label>
+	</p>
 <ul>
-	<li><?php printf(__('Show this page on the front page: %s'), wp_dropdown_pages("name=page_on_front&echo=0&show_option_none=".__('- Select -')."&selected=" . get_option('page_on_front'))); ?></li>
-	<li><?php printf(__('Show the latest posts on this page: %s'), wp_dropdown_pages("name=page_for_posts&echo=0&show_option_none=".__('- Select -')."&selected=" . get_option('page_for_posts'))); ?></li>
+	<li><?php printf(__('Front page: %s'), wp_dropdown_pages("name=page_on_front&echo=0&show_option_none=".__('- Select -')."&selected=" . get_option('page_on_front'))); ?></li>
+	<li><?php printf(__('Posts page: %s'), wp_dropdown_pages("name=page_for_posts&echo=0&show_option_none=".__('- Select -')."&selected=" . get_option('page_for_posts'))); ?></li>
 </ul>
 <?php if ( 'page' == get_option('show_on_front') && get_option('page_for_posts') == get_option('page_on_front') ) : ?>
 <div id="front-page-warning" class="updated fade-ff0000">
@@ -48,7 +49,7 @@ include('admin-header.php');
 
 <fieldset class="options"> 
 <legend><?php _e('Blog Pages') ?></legend> 
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
+<table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform"> 
 <tr valign="top"> 
 <th width="33%" scope="row"><?php _e('Show at most:') ?></th> 
 <td>
@@ -64,7 +65,7 @@ include('admin-header.php');
 
 <fieldset class="options"> 
 <legend><?php _e('Syndication Feeds') ?></legend> 
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
+<table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform"> 
 <tr valign="top"> 
 <th width="33%" scope="row"><?php _e('Show the most recent:') ?></th> 
 <td><input name="posts_per_rss" type="text" id="posts_per_rss" value="<?php form_option('posts_per_rss'); ?>" size="3" /> <?php _e('posts') ?></td> 
@@ -72,13 +73,14 @@ include('admin-header.php');
 <tr valign="top">
 <th scope="row"><?php _e('For each article, show:') ?> </th>
 <td>
-<label><input name="rss_use_excerpt"  type="radio" value="0" <?php checked(0, get_option('rss_use_excerpt')); ?>	/> <?php _e('Full text') ?></label><br />
-<label><input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_option('rss_use_excerpt')); ?> /> <?php _e('Summary') ?></label>
+<p><label><input name="rss_use_excerpt"  type="radio" value="0" <?php checked(0, get_option('rss_use_excerpt')); ?>	/> <?php _e('Full text') ?></label><br />
+<label><input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_option('rss_use_excerpt')); ?> /> <?php _e('Summary') ?></label></p>
+<p><?php _e('Note: If you use the <code>&lt;--more--&gt;</code> feature, it will cut off posts in RSS feeds.'); ?></p>
 </td>
 </tr> 
 </table> 
 </fieldset> 
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
+<table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform"> 
 <tr valign="top"> 
 <th width="33%" scope="row"><?php _e('Encoding for pages and feeds:') ?></th> 
 <td><input name="blog_charset" type="text" id="blog_charset" value="<?php form_option('blog_charset'); ?>" size="20" class="code" /><br />
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index 63784dd7f..98f8d2731 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -11,7 +11,8 @@ include('admin-header.php');
 <h2><?php _e('Writing Options') ?></h2> 
 <form method="post" action="options.php"> 
 <?php wp_nonce_field('update-options') ?>
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
+<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
+<table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform"> 
 <tr valign="top"> 
 <th width="33%" scope="row"> <?php _e('Size of the post box:') ?></th> 
 <td><input name="default_post_edit_rows" type="text" id="default_post_edit_rows" value="<?php form_option('default_post_edit_rows'); ?>" size="2" style="width: 1.5em; " /> 
@@ -57,10 +58,10 @@ endforeach;
 </table>
 
 <fieldset class="options">
-<legend><?php _e('Writing by e-mail') ?></legend>
+<legend><?php _e('Post via e-mail') ?></legend>
 <p><?php printf(__('To post to WordPress by e-mail you must set up a secret e-mail account with POP3 access. Any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret. Here are three random strings you could use: <code>%s</code>, <code>%s</code>, <code>%s</code>.'), substr(md5(uniqid(microtime())),0,5), substr(md5(uniqid(microtime())),0,5), substr(md5(uniqid(microtime())),0,5)) ?></p>
 
-<table width="100%" cellspacing="2" cellpadding="5" class="editform">
+<table width="100%" cellspacing="2" cellpadding="5" class="optiontable editform">
 <tr valign="top">
 <th scope="row"><?php _e('Mail server:') ?></th>
 <td><input name="mailserver_url" type="text" id="mailserver_url" value="<?php form_option('mailserver_url'); ?>" size="40" />
@@ -79,7 +80,7 @@ endforeach;
 </td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Default post by mail category:') ?></th>
+<th scope="row"><?php _e('Default mail category:') ?></th>
 <td><select name="default_email_category" id="default_email_category">
 <?php
 //Alreay have $categories from default_category
diff --git a/wp-admin/profile.php b/wp-admin/profile.php
index 9b90d10ef..30b399e8a 100644
--- a/wp-admin/profile.php
+++ b/wp-admin/profile.php
@@ -93,7 +93,7 @@ $bookmarklet_height= 440;
 <br clear="all" />
 <fieldset>
 <legend><?php _e('About Yourself'); ?></legend>
-<p class="desc"><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.'); ?></p>
+<p class="desc"><?php _e('Share a little biographical information. '); ?></p>
 <p><textarea name="description" rows="5" cols="30"><?php echo $profileuser->description ?></textarea></p>
 </fieldset>
 
diff --git a/wp-admin/upgrade-schema.php b/wp-admin/upgrade-schema.php
index ea5bc5df8..2166205c2 100644
--- a/wp-admin/upgrade-schema.php
+++ b/wp-admin/upgrade-schema.php
@@ -206,7 +206,6 @@ function populate_options() {
 	add_option('page_uris');
 	add_option('blacklist_keys');
 	add_option('comment_registration', 0);
-	add_option('open_proxy_check', 0);
 	add_option('rss_language', 'en');
 	add_option('html_type', 'text/html');
 	// 1.5.1
diff --git a/wp-admin/users.php b/wp-admin/users.php
index b6410b6f7..e913589f4 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -408,7 +408,7 @@ foreach ( (array) $roleclass as $user_object ) {
 	<div class="user-paging-text"><?php $wp_user_search->page_links(); ?></div>
 <?php endif; ?>
 
-	<h2><?php _e('Update Users'); ?></h2>
+	<h3><?php _e('Update Selected'); ?></h3>
 	<ul style="list-style:none;">
 		<li><input type="radio" name="action" id="action0" value="delete" /> <label for="action0"><?php _e('Delete checked users.'); ?></label></li>
 		<li>
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 1ea420af8..b7efc5005 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -118,7 +118,9 @@ fieldset.options {
 }
 
 fieldset.options legend {
-	font-size: 16px;
+	font-size: 1.5em;
+	font-weight: bold;
+	font-family: Georgia, "Times New Roman", Times, serif;
 }
 
 form, label input {
@@ -331,6 +333,8 @@ form#upload #post_content {
 .optiontable th {
 	width: 33%;
 	text-align: right;
+	font-size: 1.3em;
+	font-weight: normal;
 }
 
 .unapproved {
@@ -393,14 +397,15 @@ table .vers {
 }
 
 #adminmenu {
-	background: #6da6d1;
+	background: #83B4D8;
 	border-top: 3px solid #448abd;
 	margin: 0;
-	padding: .2em .2em .2em 2em;
+	padding: .2em .2em .3em 2em;
 }
 
 #adminmenu .current, #submenu .current {
 	font-weight: bold;
+	text-decoration: none;
 }
 
 #adminmenu a {
@@ -409,10 +414,11 @@ table .vers {
 	font-weight: normal;
 	margin: 0;
 	padding: 3px 5px;
-	text-decoration: none;
+	text-decoration: underline;
+	border-bottom: none;
 }
 
-#adminmenu a:hover, .current {
+#adminmenu a:hover, #adminmenu a.current {
 	background: #ddeaf4;
 	color: #333;
 }
@@ -916,7 +922,7 @@ table .vers {
 	border: 1px solid #ccc;
 	float: left;
 	width: 40%;
-	padding: .5em 2em;
+	padding: .5em 2em 1em;
 	margin: 1em 1em 1em 0; 
 }
 
diff --git a/wp-content/themes/default/functions.php b/wp-content/themes/default/functions.php
index a6b09ef9a..5a6400e4b 100644
--- a/wp-content/themes/default/functions.php
+++ b/wp-content/themes/default/functions.php
@@ -373,13 +373,13 @@ function kubrick_theme_page() {
 				<input type="button" onclick="tgt=document.getElementById('lowercolor');colorSelect(tgt,'pick3');return false;" name="pick3" id="pick3" value="Lower Color"></input>
 				<input type="button" name="revert" value="Revert" onclick="kRevert()" />
 				<input type="button" value="Advanced" onclick="toggleAdvanced()" />
-				<input type="submit" name="submitform" class="defbutton" value="Save" onclick="cp.hidePopup('prettyplease')" />
 				<input type="hidden" name="action" value="save" />
 				<input type="hidden" name="fontdisplay" id="fontdisplay" value="<?php echo kubrick_header_display(); ?>" />
 				<input type="hidden" name="fontcolor" id="fontcolor" value="<?php echo kubrick_header_color(); ?>" />
 				<input type="hidden" name="uppercolor" id="uppercolor" value="<?php echo kubrick_upper_color(); ?>" />
 				<input type="hidden" name="lowercolor" id="lowercolor" value="<?php echo kubrick_lower_color(); ?>" />
 				<input type="hidden" name="headerimage" id="headerimage" value="<?php echo kubrick_header_image(); ?>" />
+				<p class="submit"><input type="submit" name="submitform" class="defbutton" value="<?php _e('Update Header &raquo;'); ?>" onclick="cp.hidePopup('prettyplease')" /></p>
 			</form>
 			<div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;visibility:hidden;"> </div>
 			<div id="advanced">
diff --git a/wp-includes/classes.php b/wp-includes/classes.php
index 55b46a383..e7dd8bc18 100644
--- a/wp-includes/classes.php
+++ b/wp-includes/classes.php
@@ -1,77 +1,5 @@
 <?php
 
-class retrospam_mgr {
-	var $spam_words;
-	var $comments_list;
-	var $found_comments;
-
-	function retrospam_mgr() {
-		global $wpdb;
-
-		$list = explode("\n", get_option('moderation_keys') );
-		$list = array_unique( $list );
-		$this->spam_words = $list;
-
-		$this->comment_list = $wpdb->get_results("SELECT comment_ID AS ID, comment_content AS text, comment_approved AS approved, comment_author_url AS url, comment_author_ip AS ip, comment_author_email AS email FROM $wpdb->comments ORDER BY comment_ID ASC");
-	}	// End of class constructor
-
-	function move_spam( $id_list ) {
-		global $wpdb;
-		$cnt = 0;
-		$id_list = explode( ',', $id_list );
-
-		foreach ( $id_list as $comment ) {
-			if ( $wpdb->query("update $wpdb->comments set comment_approved = '0' where comment_ID = '$comment'") ) {
-				$cnt++;
-			}
-		}
-		echo "<div class='updated'><p> ";
-		printf(__('%d comment(s) moved to the moderation queue.'), $cnt);
-		echo "</p></div>\n";
-	}	// End function move_spam
-
-	function find_spam() {
-		$in_queue = 0;
-
-		foreach( $this->comment_list as $comment ) {
-			if( $comment->approved == 1 ) {
-				foreach( $this->spam_words as $word ) {
-					$word = trim($word);
-					if ( empty( $word ) )
-						continue;
-					$fulltext = strtolower($comment->email.' '.$comment->url.' '.$comment->ip.' '.$comment->text);
-					if( false !== strpos( $fulltext, strtolower($word) ) ) {
-						$this->found_comments[] = $comment->ID;
-						break;
-					}
-				}
-			} else {
-				$in_queue++;
-			}
-		}
-		return array( 'found' => $this->found_comments, 'in_queue' => $in_queue );
-	}	// End function find_spam
-
-	function display_edit_form( $counters ) {
-		$numfound = count($counters[found]);
-		$numqueue = $counters[in_queue];
-
-		$body = '<p>' . sprintf(__('Suspected spam comments: %s'), "<strong>$numfound</strong>") . '</p>';
-
-		if ( count($counters[found]) > 0 ) {
-			$id_list = implode( ',', $counters[found] );
-			$body .= '<p><a href="options-discussion.php?action=retrospam&amp;move=true&amp;ids='.$id_list.'">'. __('Move suspect comments to moderation queue &raquo;') . '</a></p>';
-
-		}
-		$head = '<div class="wrap"><h2>' . __('Check Comments Results:') . '</h2>';
-
-		$foot .= '<p><a href="options-discussion.php">' . __('&laquo; Return to Discussion Options page.') . '</a></p></div>';
-
-		return $head . $body . $foot;
-	} 	// End function display_edit_form
-
-}
-
 class WP {
 	var $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 's', 'search', 'exact', 'sentence', 'debug', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'comments_popup', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots');
 
diff --git a/wp-includes/comment.php b/wp-includes/comment.php
index ab8869206..c78914ee3 100644
--- a/wp-includes/comment.php
+++ b/wp-includes/comment.php
@@ -257,10 +257,6 @@ function wp_blacklist_check($author, $email, $url, $comment, $user_ip, $user_age
 		if ( preg_match($pattern, $user_agent) ) return true;
 	}
 
-	if ( isset($_SERVER['REMOTE_ADDR']) ) {
-		if ( wp_proxy_check($_SERVER['REMOTE_ADDR']) ) return true;
-	}
-
 	return false;
 }
 
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index c62404010..2e64b9d88 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1002,18 +1002,6 @@ function wp_check_filetype($filename, $mimes = null) {
 	return compact('ext', 'type');
 }
 
-function wp_proxy_check($ipnum) {
-	if ( get_option('open_proxy_check') && isset($ipnum) ) {
-		$ipnum = preg_replace( '/([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/', '$1', $ipnum );
-		$rev_ip = implode( '.', array_reverse( explode( '.', $ipnum ) ) );
-		$lookup = $rev_ip . '.sbl-xbl.spamhaus.org.';
-		if ( $lookup != gethostbyname( $lookup ) )
-			return true;
-	}
-
-	return false;
-}
-
 function wp_explain_nonce($action) {
 	if ( $action !== -1 && preg_match('/([a-z]+)-([a-z]+)(_(.+))?/', $action, $matches) ) {
 		$verb = $matches[1];