diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index 25be2395e..c29c783c9 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -78,6 +78,8 @@ case 'bulk-delete':
 break;
 case 'edit':
 
+	$title = __('Edit Category');
+
 	require_once ('admin-header.php');
 	$cat_ID = (int) $_GET['cat_ID'];
 	$category = get_category_to_edit($cat_ID);
@@ -140,8 +142,6 @@ endif; ?>
 
 <div class="wrap">
 
-	<h2><?php printf( current_user_can('manage_categories') ? __('Categories (<a href="%s">Add New</a>)') : __('Manage Tags'), '#addcat' ); ?></h2>
-
 <form id="posts-filter" action="" method="get">
 <div class="tablenav">
 
diff --git a/wp-admin/edit-category-form.php b/wp-admin/edit-category-form.php
index d1d8510ad..62888efdd 100644
--- a/wp-admin/edit-category-form.php
+++ b/wp-admin/edit-category-form.php
@@ -16,14 +16,14 @@ if ( ! empty($cat_ID) ) {
 	/**
 	 * @var string
 	 */
-	$heading = __('Edit Category');
+	$heading = '';
 	$submit_text = __('Edit Category');
 	$form = '<form name="editcat" id="editcat" method="post" action="categories.php" class="validate">';
 	$action = 'editedcat';
 	$nonce_action = 'update-category_' . $cat_ID;
 	do_action('edit_category_form_pre', $category);
 } else {
-	$heading = __('Add Category');
+	$heading = '<h2>' . __('Add Category') . '</h2>';
 	$submit_text = __('Add Category');
 	$form = '<form name="addcat" id="addcat" method="post" action="categories.php" class="add:the-list: validate">';
 	$action = 'addcat';
@@ -56,7 +56,7 @@ _fill_empty_category($category);
 ?>
 
 <div class="wrap">
-<h2><?php echo $heading ?></h2>
+<?php echo $heading ?>
 <div id="ajax-response"></div>
 <?php echo $form ?>
 <input type="hidden" name="action" value="<?php echo $action ?>" />
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index 77441d416..cf87b6880 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -123,8 +123,6 @@ if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['sp
 
 <div class="wrap">
 
-<h2><?php _e('Manage Comments'); ?></h2>
-
 <ul class="subsubsub">
 <?php
 $status_links = array();
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 7bbf51de1..99e133d88 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -426,13 +426,6 @@ endif;
 
 <div class="wrap">
 
-<h2><?php
-	if ( !isset($post_ID) || 0 == $post_ID)
-		printf( __( '<a href="%s">Posts</a> / Write New Post' ), 'edit.php' );
-	else
-		printf( __( '<a href="%s">Posts</a> / Edit Post' ), 'edit.php' );
-?></h2>
-
 <form name="post" action="post.php" method="post" id="post">
 <?php
 
diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index c0faf6612..138dd74e8 100644
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -18,7 +18,6 @@ $form_extra = "' />\n<input type='hidden' name='comment_ID' value='" . $comment-
 <form name="post" action="comment.php" method="post" id="post">
 <?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
 <div class="wrap">
-<h2><?php echo $toprow_title; ?></h2>
 
 <div id="poststuff">
 <input type="hidden" name="user_ID" value="<?php echo (int) $user_ID ?>" />
diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php
index 3a406ce1e..0efaf51ba 100644
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -78,8 +78,6 @@ endif; ?>
 
 <div class="wrap">
 
-	<h2><?php printf( current_user_can('manage_categories') ? __('Link Categories (<a href="%s">Add New</a>)') : __('Manage Tags'), '#addcat' ); ?></h2>
-
 <form id="posts-filter" action="" method="get">
 <div class="tablenav">
 
diff --git a/wp-admin/edit-link-category-form.php b/wp-admin/edit-link-category-form.php
index 5171feb73..80e6e0c68 100644
--- a/wp-admin/edit-link-category-form.php
+++ b/wp-admin/edit-link-category-form.php
@@ -16,14 +16,14 @@ if ( ! empty($cat_ID) ) {
 	/**
 	 * @var string
 	 */
-	$heading = __('Edit Category');
+	$heading = '';
 	$submit_text = __('Edit Category');
 	$form = '<form name="editcat" id="editcat" method="post" action="link-category.php" class="validate">';
 	$action = 'editedcat';
 	$nonce_action = 'update-link-category_' . $cat_ID;
 	do_action('edit_link_category_form_pre', $category);
 } else {
-	$heading = __('Add Category');
+	$heading = '<h2>' . __('Add Category') . '</h2>';
 	$submit_text = __('Add Category');
 	$form = '<form name="addcat" id="addcat" class="add:the-list: validate" method="post" action="link-category.php">';
 	$action = 'addcat';
@@ -53,7 +53,7 @@ _fill_empty_link_category($category);
 ?>
 
 <div class="wrap">
-<h2><?php echo $heading ?></h2>
+<?php echo $heading ?>
 <div id="ajax-response"></div>
 <?php echo $form ?>
 <input type="hidden" name="action" value="<?php echo $action ?>" />
diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php
index 0efd58cfd..a24420ff2 100644
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -278,8 +278,6 @@ add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link'
 
 <div class="wrap">
 
-<h2><?php echo $heading; ?></h2>
-
 <!--
 <p id="big-add-button">
 <span id="previewview">
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index e6bd11746..4596ac6d8 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -292,13 +292,6 @@ endif;
 
 <div class="wrap">
 
-<h2><?php
-	if ( !isset($post_ID) || 0 == $post_ID )
-		printf( __( '<a href="%s">Pages</a> / Write New Page' ), 'edit-pages.php' );
-	else
-		printf( __( '<a href="%s">Pages</a> / Edit Page' ), 'edit-pages.php' );
-?></h2>
-
 <form name="post" action="page.php" method="post" id="post">
 <?php if ( $notice ) : ?>
 <div id="notice" class="error"><p><?php echo $notice ?></p></div>
diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php
index 4ca92243f..214914c24 100644
--- a/wp-admin/edit-pages.php
+++ b/wp-admin/edit-pages.php
@@ -130,17 +130,6 @@ if ( (int) $_GET['skip'] ) {
 <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
 endif; ?>
 
-<h2><?php
-// Use $_GET instead of is_ since they can override each other
-$h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( stripslashes( $_GET['s'] ) ) ) : '';
-$h2_author = '';
-if ( isset($_GET['author']) && $_GET['author'] ) {
-	$author_user = get_userdata( (int) $_GET['author'] );
-	$h2_author = ' ' . sprintf(__('by %s'), wp_specialchars( $author_user->display_name ));
-}
-printf( _c( '%1$s%2$s%3$s (<a href="%4$s">Add New</a>)|You can reorder these: 1: Pages, 2: by {s}, 3: matching {s}' ), $post_status_label, $h2_author, $h2_search, 'page-new.php' );
-?></h2>
-
 <ul class="subsubsub">
 <?php
 
diff --git a/wp-admin/edit-tag-form.php b/wp-admin/edit-tag-form.php
index c76f1b830..11e2fd436 100644
--- a/wp-admin/edit-tag-form.php
+++ b/wp-admin/edit-tag-form.php
@@ -10,14 +10,14 @@ if ( ! empty($tag_ID) ) {
 	/**
 	 * @var string
 	 */
-	$heading = __('Edit Tag');
+	$heading = '';
 	$submit_text = __('Edit Tag');
 	$form = '<form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate">';
 	$action = 'editedtag';
 	$nonce_action = 'update-tag_' . $tag_ID;
 	do_action('edit_tag_form_pre', $tag);
 } else {
-	$heading = __('Add Tag');
+	$heading = '<h2>' . __('Add Tag') . '</h2>';
 	$submit_text = __('Add Tag');
 	$form = '<form name="addtag" id="addtag" method="post" action="edit-tags.php" class="add:the-list: validate">';
 	$action = 'addtag';
@@ -27,7 +27,7 @@ if ( ! empty($tag_ID) ) {
 ?>
 
 <div class="wrap">
-<h2><?php echo $heading ?></h2>
+<?php echo $heading ?>
 <div id="ajax-response"></div>
 <?php echo $form ?>
 <input type="hidden" name="action" value="<?php echo $action ?>" />
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index d52b1220f..7869b2059 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -72,6 +72,7 @@ case 'bulk-delete':
 break;
 
 case 'edit':
+	$title = __('Edit Tag');
 
 	require_once ('admin-header.php');
 	$tag_ID = (int) $_GET['tag_ID'];
@@ -144,8 +145,6 @@ endif; ?>
 
 <div class="wrap">
 
-	<h2><?php printf( current_user_can('manage_categories') ? __('Tags (<a href="%s">Add New</a>)') : __('Manage Tags'), '#addtag' ); ?></h2>
-
 <form id="posts-filter" action="" method="get">
 <div class="tablenav">
 
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 29329a0d6..51d615ff3 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -120,37 +120,6 @@ unset($_GET['upd']);
 
 <div class="wrap">
 
-<h2><?php
-if ( is_single() ) {
-	printf(__('Comments on %s'), apply_filters( "the_title", $post->post_title));
-} else {
-	$post_status_label = _c('Posts|manage posts header');
-	if ( isset($_GET['post_status']) && in_array( $_GET['post_status'], array_keys($post_stati) ) )
-        $post_status_label = $post_stati[$_GET['post_status']][1];
-   	//TODO: Unreachable code: $post_listing_pageable is undefined, Similar code in upload.php
-	//if ( $post_listing_pageable && !is_archive() && !is_search() )
-	//	$h2_noun = is_paged() ? sprintf(__( 'Previous %s' ), $post_status_label) : sprintf(__('Latest %s'), $post_status_label);
-	//else
-		$h2_noun = $post_status_label;
-	// Use $_GET instead of is_ since they can override each other
-	$h2_author = '';
-	$_GET['author'] = isset($_GET['author']) ? (int) $_GET['author'] : 0;
-	if ( $_GET['author'] != 0 ) {
-		if ( $_GET['author'] == '-' . $user_ID ) { // author exclusion
-			$h2_author = ' ' . __('by other authors');
-		} else {
-			$author_user = get_userdata( get_query_var( 'author' ) );
-			$h2_author = ' ' . sprintf(__('by %s'), wp_specialchars( $author_user->display_name ));
-		}
-	}
-	$h2_search = isset($_GET['s'])   && $_GET['s']   ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( get_search_query() ) ) : '';
-	$h2_cat    = isset($_GET['cat']) && $_GET['cat'] ? ' ' . sprintf( __('in &#8220;%s&#8221;'), single_cat_title('', false) ) : '';
-	$h2_tag    = isset($_GET['tag']) && $_GET['tag'] ? ' ' . sprintf( __('tagged with &#8220;%s&#8221;'), single_tag_title('', false) ) : '';
-	$h2_month  = isset($_GET['m'])   && $_GET['m']   ? ' ' . sprintf( __('during %s'), single_month_title(' ', false) ) : '';
-	printf( _c( '%1$s%2$s%3$s%4$s%5$s%6$s (<a href="%7$s">Add New</a>)|You can reorder these: 1: Posts, 2: by {s}, 3: matching {s}, 4: in {s}, 5: tagged with {s}, 6: during {s}' ), $h2_noun, $h2_author, $h2_search, $h2_cat, $h2_tag, $h2_month, 'post-new.php' );
-}
-?></h2>
-
 <ul class="subsubsub">
 <?php
 if ( empty($locked_post_status) ) :
diff --git a/wp-admin/export.php b/wp-admin/export.php
index 9eb47683f..44e24482b 100644
--- a/wp-admin/export.php
+++ b/wp-admin/export.php
@@ -22,7 +22,6 @@ require_once ('admin-header.php');
 ?>
 
 <div class="wrap">
-<h2><?php _e('Export'); ?></h2>
 <p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p>
 <p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags.'); ?></p>
 <p><?php _e('Once you&#8217;ve saved the download file, you can use the Import function on another WordPress blog to import this blog.'); ?></p>
diff --git a/wp-admin/import.php b/wp-admin/import.php
index 78f82d98b..7cda6959a 100644
--- a/wp-admin/import.php
+++ b/wp-admin/import.php
@@ -13,7 +13,6 @@ require_once ('admin-header.php');
 ?>
 
 <div class="wrap">
-<h2><?php _e('Import'); ?></h2>
 <p><?php _e('If you have posts or comments in another system, WordPress can import those into this blog. To get started, choose a system to import from below:'); ?></p>
 
 <?php
diff --git a/wp-admin/inbox.php b/wp-admin/inbox.php
index 343625eaa..a66698d1b 100644
--- a/wp-admin/inbox.php
+++ b/wp-admin/inbox.php
@@ -21,7 +21,6 @@ endif;
 ?>
 <div class="wrap">
 <form id="inbox-filter" action="" method="get">
-<h2><?php _e('Inbox'); ?></h2>
 <ul class="subsubsub">
 <li><a href="#" class="current"><?php _e('Messages') ?></a> | </li><li><a href="#"><?php echo sprintf(__('Archived') . ' (%s)', '42'); ?></a></li>
 </ul>
diff --git a/wp-admin/link-category.php b/wp-admin/link-category.php
index 309bfdeed..05145c86e 100644
--- a/wp-admin/link-category.php
+++ b/wp-admin/link-category.php
@@ -61,7 +61,7 @@ case 'delete':
 break;
 
 case 'edit':
-	$title = __('Categories');
+	$title = __('Edit Category');
 	$parent_file = 'edit.php';
 	$submenu_file = 'edit-link-categories.php';
 	require_once ('admin-header.php');
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index 5e0247641..862dc20d4 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -99,8 +99,6 @@ if ( isset($_GET['deleted']) ) {
 
 <div class="wrap">
 
-<h2><?php printf( __('Links (<a href="%s">Add New</a>)' ), 'link-add.php' ); ?></h2>
-
 <form id="list-filter" action="" method="get">
 <?php
 $categories = get_terms('link_category', "hide_empty=1");
diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php
index 8cc3ae766..456a3ae8f 100644
--- a/wp-admin/media-upload.php
+++ b/wp-admin/media-upload.php
@@ -56,7 +56,6 @@ if ( isset($_GET['inline']) ) {
 	$parent_file = 'edit.php';
 	require_once('admin-header.php'); ?>
 	<div class="wrap">
-	<h2><?php _e('Upload Media') ?></h2>
 
 	<form enctype="multipart/form-data" method="post" action="media-upload.php?inline=&upload-page-form=" class="media-upload-form type-form validate" id="file-form">
 	
diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index 9a97ede46..5a77c5a5d 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -16,7 +16,6 @@ include('admin-header.php');
 ?>
 
 <div class="wrap">
-<h2><?php _e('Discussion Settings') ?></h2>
 <form method="post" action="options.php">
 <input type='hidden' name='option_page' value='discussion' />
 <?php wp_nonce_field('discussion-options') ?>
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index fbf945269..3f1eef5e2 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -16,7 +16,6 @@ include('./admin-header.php');
 ?>
 
 <div class="wrap">
-<h2><?php _e('General Settings') ?></h2>
 <form method="post" action="options.php">
 <?php wp_nonce_field('general-options') ?>
 <input type='hidden' name='option_page' value='general' />
diff --git a/wp-admin/options-media.php b/wp-admin/options-media.php
index cfb642718..022a3187f 100644
--- a/wp-admin/options-media.php
+++ b/wp-admin/options-media.php
@@ -18,7 +18,6 @@ include('admin-header.php');
 
 <div class="wrap">
 
-<h2><?php _e('Media Settings') ?></h2>
 <form action="options.php" method="post">
 <p><?php _e('The setting below determines where images, documents, and other media files will be linked to when inserted into the body of a post.'); ?></p>
 
diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php
index 8acc38f03..7bac2171e 100644
--- a/wp-admin/options-misc.php
+++ b/wp-admin/options-misc.php
@@ -17,7 +17,6 @@ include('admin-header.php');
 ?>
 
 <div class="wrap">
-<h2><?php _e('Miscellaneous Settings') ?></h2>
 <form method="post" action="options.php">
 <input type='hidden' name='option_page' value='misc' />
 <?php wp_nonce_field('misc-options') ?>
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index e0f2b345d..3b9cd7ab7 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -123,7 +123,6 @@ else
 <?php endif; ?>
 
 <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><?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>
diff --git a/wp-admin/options-privacy.php b/wp-admin/options-privacy.php
index 7e936c8bb..e1ab331ff 100644
--- a/wp-admin/options-privacy.php
+++ b/wp-admin/options-privacy.php
@@ -16,7 +16,6 @@ include('./admin-header.php');
 ?>
 
 <div class="wrap">
-<h2><?php _e('Privacy Settings') ?></h2>
 <form method="post" action="options.php">
 <?php wp_nonce_field('privacy-options') ?>
 <input type='hidden' name='option_page' value='privacy' />
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index af2bf1634..372da4d85 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -16,7 +16,6 @@ include('admin-header.php');
 ?>
 
 <div class="wrap">
-<h2><?php _e('Reading Settings') ?></h2>
 <form name="form1" method="post" action="options.php">
 <?php wp_nonce_field('reading-options') ?>
 <input type='hidden' name='option_page' value='reading' />
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index 71ac9c56d..0f339ec6e 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -16,7 +16,6 @@ include('admin-header.php');
 ?>
 
 <div class="wrap">
-<h2><?php _e('Writing Settings') ?></h2>
 <form method="post" action="options.php">
 <?php wp_nonce_field('writing-options') ?>
 <input type='hidden' name='option_page' value='writing' />
diff --git a/wp-admin/page.php b/wp-admin/page.php
index f02335dbf..f1fe56263 100644
--- a/wp-admin/page.php
+++ b/wp-admin/page.php
@@ -82,7 +82,7 @@ case 'post':
 	break;
 
 case 'edit':
-	$title = __('Edit');
+	$title = __('Edit Page');
 	$editing = true;
 	$page_ID = $post_ID = $p = (int) $_GET['post'];
 	$post = get_post_to_edit($page_ID);
diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php
index 856f065cc..a7c58aa9f 100644
--- a/wp-admin/plugin-editor.php
+++ b/wp-admin/plugin-editor.php
@@ -96,9 +96,6 @@ default:
 </div>
 <?php endif; ?>
 <div class="wrap">
-<div class="bordertitle">
-	<h2><?php _e('Plugin Editor'); ?></h2>
-</div>
 <div class="tablenav">
 <div class="alignleft">
 <big><?php
diff --git a/wp-admin/plugin-install.php b/wp-admin/plugin-install.php
index 4f3e1dacb..4b962617e 100644
--- a/wp-admin/plugin-install.php
+++ b/wp-admin/plugin-install.php
@@ -48,7 +48,6 @@ do_action('install_plugins_pre_' . $tab);
 include('admin-header.php');
 ?>
 <div class="wrap">
-	<h2><?php _e('Install Plugins') ?></h2>
 	<ul class="subsubsub">
 <?php
 $display_tabs = array();
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 324637515..21d342570 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -203,7 +203,6 @@ if( !empty($invalid) )
 <?php endif; ?>
 
 <div class="wrap">
-<h2><?php _e('Plugin Management'); ?></h2>
 <p><?php _e('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.'); ?></p>
 <?php
 
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index be0fb2800..07019c9ee 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -187,39 +187,6 @@ if ( isset($message) ) { ?>
 
 <div class="wrap">
 
-<h2><?php
-if ( isset($_GET['detached']) ) {
-	_e('Unattached Media');
-} elseif ( is_singular() ) {
-	printf( __('Comments on %s'), apply_filters("the_title", $post->post_title) );
-} else {
-	$post_mime_type_label = _c('Media|manage media header');
-	if ( isset($_GET['post_mime_type']) && in_array( $_GET['post_mime_type'], array_keys($post_mime_types) ) )
-        $post_mime_type_label = $post_mime_types[$_GET['post_mime_type']][1];
-   	//TODO: Unreachable code: $post_listing_pageable is undefined, Similar code in edit.php
-	//if ( $post_listing_pageable && !is_archive() && !is_search() )
-	//	$h2_noun = is_paged() ? sprintf(__( 'Previous %s' ), $post_mime_type_label) : sprintf(__('Latest %s'), $post_mime_type_label);
-	//else
-		$h2_noun = $post_mime_type_label;
-	// Use $_GET instead of is_ since they can override each other
-	$h2_author = '';
-	$_GET['author'] = isset( $_GET['author'] ) ? (int) $_GET['author'] : 0;
-	if ( $_GET['author'] != 0 ) {
-		if ( $_GET['author'] == '-' . $user_ID ) { // author exclusion
-			$h2_author = ' ' . __('by other authors');
-		} else {
-			$author_user = get_userdata( get_query_var( 'author' ) );
-			$h2_author = ' ' . sprintf(__('by %s'), wp_specialchars( $author_user->display_name ));
-		}
-	}
-	$h2_search = isset($_GET['s'])   && $_GET['s']   ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( get_search_query() ) ) : '';
-	$h2_cat    = isset($_GET['cat']) && $_GET['cat'] ? ' ' . sprintf( __('in &#8220;%s&#8221;'), single_cat_title('', false) ) : '';
-	$h2_tag    = isset($_GET['tag']) && $_GET['tag'] ? ' ' . sprintf( __('tagged with &#8220;%s&#8221;'), single_tag_title('', false) ) : '';
-	$h2_month  = isset($_GET['m'])   && $_GET['m']   ? ' ' . sprintf( __('during %s'), single_month_title(' ', false) ) : '';
-	printf( _c( '%1$s%2$s%3$s%4$s%5$s%6$s (<a href="%7$s">Add New</a>)|You can reorder these: 1: Posts, 2: by {s}, 3: matching {s}, 4: in {s}, 5: tagged with {s}, 6: during {s}' ), $h2_noun, $h2_author, $h2_search, $h2_cat, $h2_tag, $h2_month, 'media-upload.php?inline' );
-}
-?></h2>
-
 <ul class="subsubsub">
 <?php
 $type_links = array();
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index 260555fb9..766ba6072 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -169,7 +169,6 @@ include ('admin-header.php');
 <?php endif; ?>
 
 <div class="wrap" id="profile-page">
-<h2><?php $is_profile_page? _e('Your Profile and Personal Options') : _e('Edit User'); ?></h2>
 
 <form id="your-profile" action="" method="post">
 <?php wp_nonce_field('update-user_' . $user_id) ?>
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 78bde7586..09a0fdb42 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -271,8 +271,6 @@ if ( ! empty($messages) ) {
 <form id="posts-filter" action="" method="get">
 	<?php if ( $wp_user_search->is_search() ) : ?>
 		<h2><?php printf( current_user_can('create_users') ? __('Users Matching "%2$s" (<a href="%1$s">Add New</a>)') : __('Add New'), '#add-new-user', wp_specialchars($wp_user_search->search_term) ); ?></h2>
-	<?php else : ?>
-		<h2><?php printf( current_user_can('create_users') ? __('Users (<a href="%s">Add New</a>)') : __('Add New'), '#add-new-user' ); ?></h2>
 	<?php endif; ?>
 
 <ul class="subsubsub">
diff --git a/wp-content/themes/default/functions.php b/wp-content/themes/default/functions.php
index 9008dfa5c..72bf7d5ef 100644
--- a/wp-content/themes/default/functions.php
+++ b/wp-content/themes/default/functions.php
@@ -364,7 +364,6 @@ function kubrick_theme_page() {
 ?>
 <div class='wrap'>
 	<div id="kubrick-header">
-	<h2><?php _e('Header Image and Color'); ?></h2>
 		<div id="headwrap">
 			<div id="header">
 				<div id="headerimg">