diff --git a/wp-admin/gears-manifest.php b/wp-admin/gears-manifest.php
deleted file mode 100644
index 8feb485f91..0000000000
--- a/wp-admin/gears-manifest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Defines the Gears manifest file for Google Gears offline storage.
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/**
- * Disable error reporting
- *
- * Set this to error_reporting( E_ALL ) or error_reporting( E_ALL | E_STRICT ) for debugging
- */
-error_reporting(0);
-
-/** Set ABSPATH for execution */
-define( 'ABSPATH', dirname(dirname(__FILE__)) . '/' );
-
-require(ABSPATH . '/wp-admin/includes/manifest.php');
-
-$files = get_manifest();
-
-header( 'Expires: Wed, 11 Jan 1984 05:00:00 GMT' );
-header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' );
-header( 'Cache-Control: no-cache, must-revalidate, max-age=0' );
-header( 'Pragma: no-cache' );
-header( 'Content-Type: application/x-javascript; charset=UTF-8' );
-?>
-{
-"betaManifestVersion" : 1,
-"version" : "<?php echo $man_version; ?>",
-"entries" : [
-<?php
-$entries = '';
-
-foreach ( $files as $file ) {
-	// Set ignoreQuery, defaulting to true
-	$ignore_query = ( isset($file[2]) && !$file[2] ) ? '' : ', "ignoreQuery" : true ';
-
-	// If version is not set, just output the file
-	if ( !isset($file[1]) )
-		$entries .= '{ "url" : "' . $file[0] . '"' . $ignore_query . ' }' . "\n";
-	// Output url and src
-	else
-		$entries .= '{ "url" : "' . $file[0] . '", "src" : "' . $file[0] . '?' . $file[1] . '"' . $ignore_query . ' },' . "\n";
-}
-
-echo trim( trim($entries), ',' );
-?>
-
-]}
diff --git a/wp-admin/includes/manifest.php b/wp-admin/includes/manifest.php
deleted file mode 100644
index 99b4774817..0000000000
--- a/wp-admin/includes/manifest.php
+++ /dev/null
@@ -1,201 +0,0 @@
-<?php
-
-if ( !defined('ABSPATH') )
-	exit;
-
-require(ABSPATH . 'wp-includes/version.php');
-
-$man_version = md5( $tinymce_version . $manifest_version );
-$mce_ver = "ver=$tinymce_version";
-
-/**
- * Retrieve list of all cacheable WP files
- *
- * Array format: file, version (optional), bool (whether to use src and set ignoreQuery, defaults to true)
- */
-function &get_manifest() {
-	global $mce_ver;
-
-	$files = array(
-		array('images/align-center.png'),
-		array('images/align-left.png'),
-		array('images/align-none.png'),
-		array('images/align-right.png'),
-		array('images/archive-link.png'),
-		array('images/blue-grad.png'),
-		array('images/bubble_bg.gif'),
-		array('images/bubble_bg-rtl.gif'),
-		array('images/button-grad.png'),
-		array('images/button-grad-active.png'),
-		array('images/comment-grey-bubble.png'),
-		array('images/date-button.gif'),
-		array('images/ed-bg.gif'),
-		array('images/fade-butt.png'),
-		array('images/fav.png'),
-		array('images/fav-arrow.gif'),
-		array('images/fav-arrow-rtl.gif'),
-		array('images/generic.png'),
-		array('images/gray-grad.png'),
-		array('images/icons32.png'),
-		array('images/icons32-vs.png'),
-		array('images/list.png'),
-		array('images/wpspin_light.gif'),
-		array('images/wpspin_dark.gif'),
-		array('images/logo.gif'),
-		array('images/logo-ghost.png'),
-		array('images/media-button-image.gif'),
-		array('images/media-button-music.gif'),
-		array('images/media-button-other.gif'),
-		array('images/media-button-video.gif'),
-		array('images/menu.png'),
-		array('images/menu-vs.png'),
-		array('images/menu-arrows.gif'),
-		array('images/menu-bits.gif'),
-		array('images/menu-bits-rtl.gif'),
-		array('images/menu-dark.gif'),
-		array('images/menu-dark-rtl.gif'),
-		array('images/no.png'),
-		array('images/required.gif'),
-		array('images/resize.gif'),
-		array('images/screen-options-right.gif'),
-		array('images/screen-options-right-up.gif'),
-		array('images/se.png'),
-		array('images/star.gif'),
-		array('images/toggle-arrow.gif'),
-		array('images/toggle-arrow-rtl.gif'),
-		array('images/white-grad.png'),
-		array('images/white-grad-active.png'),
-		array('images/wordpress-logo.png'),
-		array('images/wp-logo.png'),
-		array('images/xit.gif'),
-		array('images/yes.png'),
-		array('../wp-includes/images/crystal/archive.png'),
-		array('../wp-includes/images/crystal/audio.png'),
-		array('../wp-includes/images/crystal/code.png'),
-		array('../wp-includes/images/crystal/default.png'),
-		array('../wp-includes/images/crystal/document.png'),
-		array('../wp-includes/images/crystal/interactive.png'),
-		array('../wp-includes/images/crystal/text.png'),
-		array('../wp-includes/images/crystal/video.png'),
-		array('../wp-includes/images/crystal/spreadsheet.png'),
-		array('../wp-includes/images/rss.png'),
-		array('../wp-includes/images/blank.gif'),
-		array('../wp-includes/images/upload.png'),
-		array('../wp-includes/js/thickbox/loadingAnimation.gif'),
-		array('../wp-includes/js/thickbox/tb-close.png'),
-	);
-
-	if ( @is_file('../wp-includes/js/tinymce/tiny_mce.js') ) :
-	$mce = array(
-		array('../wp-includes/js/tinymce/wp-tinymce.php', $mce_ver),
-
-		array('../wp-includes/js/tinymce/tiny_mce.js', $mce_ver),
-		array('../wp-includes/js/tinymce/langs/wp-langs-en.js', $mce_ver),
-		array('../wp-includes/js/tinymce/utils/mctabs.js', $mce_ver),
-		array('../wp-includes/js/tinymce/utils/validate.js', $mce_ver),
-		array('../wp-includes/js/tinymce/utils/form_utils.js', $mce_ver),
-		array('../wp-includes/js/tinymce/utils/editable_selects.js', $mce_ver),
-		array('../wp-includes/js/tinymce/tiny_mce_popup.js', $mce_ver),
-
-		array('../wp-includes/js/tinymce/themes/advanced/editor_template.js', $mce_ver),
-		array('../wp-includes/js/tinymce/themes/advanced/source_editor.htm', $mce_ver),
-		array('../wp-includes/js/tinymce/themes/advanced/anchor.htm', $mce_ver),
-		array('../wp-includes/js/tinymce/themes/advanced/image.htm', $mce_ver),
-		array('../wp-includes/js/tinymce/themes/advanced/link.htm', $mce_ver),
-		array('../wp-includes/js/tinymce/themes/advanced/color_picker.htm', $mce_ver),
-		array('../wp-includes/js/tinymce/themes/advanced/charmap.htm', $mce_ver),
-		array('../wp-includes/js/tinymce/themes/advanced/js/color_picker.js', $mce_ver),
-		array('../wp-includes/js/tinymce/themes/advanced/js/charmap.js', $mce_ver),
-		array('../wp-includes/js/tinymce/themes/advanced/js/image.js', $mce_ver),
-		array('../wp-includes/js/tinymce/themes/advanced/js/link.js', $mce_ver),
-		array('../wp-includes/js/tinymce/themes/advanced/js/source_editor.js', $mce_ver),
-		array('../wp-includes/js/tinymce/themes/advanced/js/anchor.js', $mce_ver),
-		array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css', $mce_ver),
-		array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css', $mce_ver),
-		array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css', $mce_ver),
-
-		array('../wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js', $mce_ver),
-		array('../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm', $mce_ver),
-
-		array('../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js', $mce_ver),
-		array('../wp-includes/js/tinymce/plugins/inlinepopups/template.htm', $mce_ver),
-		array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css', $mce_ver),
-
-		array('../wp-includes/js/tinymce/plugins/media/editor_plugin.js', $mce_ver),
-		array('../wp-includes/js/tinymce/plugins/media/js/media.js', $mce_ver),
-		array('../wp-includes/js/tinymce/plugins/media/media.htm', $mce_ver),
-		array('../wp-includes/js/tinymce/plugins/media/css/content.css', $mce_ver),
-		array('../wp-includes/js/tinymce/plugins/media/css/media.css', $mce_ver),
-
-		array('../wp-includes/js/tinymce/plugins/paste/editor_plugin.js', $mce_ver),
-		array('../wp-includes/js/tinymce/plugins/paste/js/pasteword.js', $mce_ver),
-		array('../wp-includes/js/tinymce/plugins/paste/js/pastetext.js', $mce_ver),
-		array('../wp-includes/js/tinymce/plugins/paste/pasteword.htm', $mce_ver),
-		array('../wp-includes/js/tinymce/plugins/paste/blank.htm', $mce_ver),
-		array('../wp-includes/js/tinymce/plugins/paste/pastetext.htm', $mce_ver),
-
-		array('../wp-includes/js/tinymce/plugins/safari/editor_plugin.js', $mce_ver),
-
-		array('../wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js', $mce_ver),
-		array('../wp-includes/js/tinymce/plugins/spellchecker/css/content.css', $mce_ver),
-
-		array('../wp-includes/js/tinymce/plugins/tabfocus/editor_plugin.js', $mce_ver),
-
-		array('../wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js', $mce_ver),
-		array('../wp-includes/js/tinymce/plugins/wordpress/css/content.css', $mce_ver),
-
-		array('../wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js', $mce_ver),
-		array('../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html', $mce_ver),
-		array('../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js', $mce_ver),
-		array('../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css', $mce_ver),
-		array('../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css', $mce_ver),
-
-		array('../wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js', $mce_ver),
-
-		array('../wp-includes/js/tinymce/themes/advanced/img/icons.gif'),
-		array('../wp-includes/js/tinymce/themes/advanced/img/colorpicker.jpg'),
-		array('../wp-includes/js/tinymce/themes/advanced/img/fm.gif'),
-		array('../wp-includes/js/tinymce/themes/advanced/img/gotmoxie.png'),
-		array('../wp-includes/js/tinymce/themes/advanced/img/sflogo.png'),
-		array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.png'),
-		array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/tabs.gif'),
-		array('../wp-includes/images/down_arrow.gif'),
-		array('../wp-includes/js/tinymce/themes/advanced/skins/default/img/progress.gif'),
-		array('../wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_check.gif'),
-		array('../wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_arrow.gif'),
-		array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/drag.gif'),
-		array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif'),
-		array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif'),
-		array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif'),
-		array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif'),
-		array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/button.gif'),
-		array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif'),
-		array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif'),
-		array('../wp-includes/js/tinymce/plugins/media/img/flash.gif'),
-		array('../wp-includes/js/tinymce/plugins/media/img/quicktime.gif'),
-		array('../wp-includes/js/tinymce/plugins/media/img/realmedia.gif'),
-		array('../wp-includes/js/tinymce/plugins/media/img/shockwave.gif'),
-		array('../wp-includes/js/tinymce/plugins/media/img/windowsmedia.gif'),
-		array('../wp-includes/js/tinymce/plugins/media/img/trans.gif'),
-		array('../wp-includes/js/tinymce/plugins/spellchecker/img/wline.gif'),
-		array('../wp-includes/js/tinymce/plugins/wordpress/img/more.gif'),
-		array('../wp-includes/js/tinymce/plugins/wordpress/img/more_bug.gif'),
-		array('../wp-includes/js/tinymce/plugins/wordpress/img/page.gif'),
-		array('../wp-includes/js/tinymce/plugins/wordpress/img/page_bug.gif'),
-		array('../wp-includes/js/tinymce/plugins/wordpress/img/toolbars.gif'),
-		array('../wp-includes/js/tinymce/plugins/wordpress/img/help.gif'),
-		array('../wp-includes/js/tinymce/plugins/wordpress/img/image.gif'),
-		array('../wp-includes/js/tinymce/plugins/wordpress/img/media.gif'),
-		array('../wp-includes/js/tinymce/plugins/wordpress/img/video.gif'),
-		array('../wp-includes/js/tinymce/plugins/wordpress/img/audio.gif'),
-		array('../wp-includes/js/tinymce/plugins/wpeditimage/img/image.png'),
-		array('../wp-includes/js/tinymce/plugins/wpeditimage/img/delete.png'),
-		array('../wp-includes/js/tinymce/plugins/wpgallery/img/delete.png'),
-		array('../wp-includes/js/tinymce/plugins/wpgallery/img/edit.png'),
-		array('../wp-includes/js/tinymce/plugins/wpgallery/img/gallery.png')
-	);
-	$files = array_merge($files, $mce);
-	endif;
-
-	return $files;
-}
diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
index bf9ef27663..c902ec50c5 100644
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -395,6 +395,9 @@ $_old_files = array(
 'wp-includes/js/tinymce/plugins/wplink/editor_plugin.dev.js',
 // Don't delete, yet: 'wp-pass.php',
 // Don't delete, yet: 'wp-register.php',
+// 3.5
+'wp-admin/gears-manifest.php',
+'wp-admin/includes/manifest.php',
 );
 
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d86a1d596f..be25d63086 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -20,13 +20,6 @@ $wp_db_version = 20596;
  */
 $tinymce_version = '349-20805';
 
-/**
- * Holds the cache manifest version
- *
- * @global string $manifest_version
- */
-$manifest_version = '20111113';
-
 /**
  * Holds the required PHP version
  *