diff --git a/src/bp-blogs/bp-blogs-buddybar.php b/src/bp-blogs/bp-blogs-buddybar.php
deleted file mode 100644
index 6d0a493..0000000
--- a/src/bp-blogs/bp-blogs-buddybar.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * BuddyPress Blogs BuddyBar functions.
- *
- * @package BuddyPress
- * @subpackage BlogsBuddyBar
- */
-
-// Exit if accessed directly
-if ( !defined( 'ABSPATH' ) ) exit;
-
-/**
- * Add a Sites menu to the BuddyBar.
- *
- * @since BuddyPress (1.0.0)
- *
- * @global object $bp The BuddyPress global settings object.
- *
- * @return bool|null Returns false on failure. Otherwise echoes the menu item.
- */
-function bp_adminbar_blogs_menu() {
-	global $bp;
-
-	if ( !is_user_logged_in() || !bp_is_active( 'blogs' ) )
-		return false;
-
-	if ( !is_multisite() )
-		return false;
-
-	$blogs = wp_cache_get( 'bp_blogs_of_user_' . bp_loggedin_user_id() . '_inc_hidden', 'bp' );
-	if ( empty( $blogs ) ) {
-		$blogs = bp_blogs_get_blogs_for_user( bp_loggedin_user_id(), true );
-		wp_cache_set( 'bp_blogs_of_user_' . bp_loggedin_user_id() . '_inc_hidden', $blogs, 'bp' );
-	}
-
-	$counter = 0;
-	if ( is_array( $blogs['blogs'] ) && (int) $blogs['count'] ) {
-
-		echo '<li id="bp-adminbar-blogs-menu"><a href="' . trailingslashit( bp_loggedin_user_domain() . bp_get_blogs_slug() ) . '">';
-
-		_e( 'My Sites', 'buddypress' );
-
-		echo '</a>';
-		echo '<ul>';
-
-		foreach ( (array) $blogs['blogs'] as $blog ) {
-			$alt      = ( 0 == $counter % 2 ) ? ' class="alt"' : '';
-			$site_url = esc_attr( $blog->siteurl );
-
-			echo '<li' . $alt . '>';
-			echo '<a href="' . $site_url . '">' . esc_html( $blog->name ) . '</a>';
-			echo '<ul>';
-			echo '<li class="alt"><a href="' . $site_url . 'wp-admin/">' . __( 'Dashboard', 'buddypress' ) . '</a></li>';
-			echo '<li><a href="' . $site_url . 'wp-admin/post-new.php">' . __( 'New Post', 'buddypress' ) . '</a></li>';
-			echo '<li class="alt"><a href="' . $site_url . 'wp-admin/edit.php">' . __( 'Manage Posts', 'buddypress' ) . '</a></li>';
-			echo '<li><a href="' . $site_url . 'wp-admin/edit-comments.php">' . __( 'Manage Comments', 'buddypress' ) . '</a></li>';
-			echo '</ul>';
-
-			do_action( 'bp_adminbar_blog_items', $blog );
-
-			echo '</li>';
-			$counter++;
-		}
-
-		$alt = ( 0 == $counter % 2 ) ? ' class="alt"' : '';
-
-		if ( bp_blog_signup_enabled() ) {
-			echo '<li' . $alt . '>';
-			echo '<a href="' . bp_get_root_domain() . '/' . bp_get_blogs_root_slug() . '/create/">' . __( 'Create a Site!', 'buddypress' ) . '</a>';
-			echo '</li>';
-		}
-
-		echo '</ul>';
-		echo '</li>';
-	}
-}
-add_action( 'bp_adminbar_menus', 'bp_adminbar_blogs_menu', 6 );
diff --git a/src/bp-blogs/bp-blogs-loader.php b/src/bp-blogs/bp-blogs-loader.php
index c392d32..55ad320 100644
--- a/src/bp-blogs/bp-blogs-loader.php
+++ b/src/bp-blogs/bp-blogs-loader.php
@@ -93,7 +93,6 @@ class BP_Blogs_Component extends BP_Component {
 			'filters',
 			'activity',
 			'functions',
-			'buddybar'
 		);
 
 		if ( is_multisite() )
diff --git a/src/bp-core/admin/bp-core-settings.php b/src/bp-core/admin/bp-core-settings.php
index e112df7..71f8f33 100644
--- a/src/bp-core/admin/bp-core-settings.php
+++ b/src/bp-core/admin/bp-core-settings.php
@@ -49,21 +49,6 @@ function bp_admin_setting_callback_account_deletion() {
 <?php
 }
 
-/**
- * If user has upgraded to 1.6 and chose to retain their BuddyBar, offer then a switch to change over
- * to the WP Toolbar.
- *
- * @since BuddyPress (1.6)
- */
-function bp_admin_setting_callback_force_buddybar() {
-?>
-
-	<input id="_bp_force_buddybar" name="_bp_force_buddybar" type="checkbox" value="1" <?php checked( ! bp_force_buddybar( true ) ); ?> />
-	<label for="_bp_force_buddybar"><?php _e( 'Switch to WordPress Toolbar', 'buddypress' ); ?></label>
-
-<?php
-}
-
 /** Activity *******************************************************************/
 
 /**
@@ -118,20 +103,6 @@ function bp_admin_setting_callback_heartbeat() {
 }
 
 /**
- * Sanitization for _bp_force_buddyvar
- *
- * If upgraded to 1.6 and you chose to keep the BuddyBar, a checkbox asks if you want to switch to
- * the WP Toolbar. The option we store is 1 if the BuddyBar is forced on, so we use this function
- * to flip the boolean before saving the intval.
- *
- * @since BuddyPress (1.6)
- * @access Private
- */
-function bp_admin_sanitize_callback_force_buddybar( $value = false ) {
-	return $value ? 0 : 1;
-}
-
-/**
  * Sanitization for bp-disable-blogforum-comments setting
  *
  * In the UI, a checkbox asks whether you'd like to *enable* blog/forum activity comments. For
diff --git a/src/bp-core/bp-core-admin.php b/src/bp-core/bp-core-admin.php
index 8942a82..58cb2d7 100644
--- a/src/bp-core/bp-core-admin.php
+++ b/src/bp-core/bp-core-admin.php
@@ -319,12 +319,6 @@ class BP_Admin {
 		add_settings_field( 'hide-loggedout-adminbar',        __( 'Toolbar',        'buddypress' ), 'bp_admin_setting_callback_admin_bar',        'buddypress', 'bp_main' );
 	 	register_setting  ( 'buddypress',           'hide-loggedout-adminbar',        'intval'                                                                              );
 
-		// Only show 'switch to Toolbar' option if the user chose to retain the BuddyBar during the 1.6 upgrade
-		if ( (bool) bp_get_option( '_bp_force_buddybar', false ) ) {
-			add_settings_field( '_bp_force_buddybar', __( 'Toolbar', 'buddypress' ), 'bp_admin_setting_callback_force_buddybar', 'buddypress', 'bp_main' );
-		 	register_setting( 'buddypress', '_bp_force_buddybar', 'bp_admin_sanitize_callback_force_buddybar' );
-		}
-
 		// Allow account deletion
 		add_settings_field( 'bp-disable-account-deletion', __( 'Account Deletion', 'buddypress' ), 'bp_admin_setting_callback_account_deletion', 'buddypress', 'bp_main' );
 	 	register_setting  ( 'buddypress',           'bp-disable-account-deletion', 'intval'                                                                              );
diff --git a/src/bp-core/bp-core-adminbar.php b/src/bp-core/bp-core-adminbar.php
index f92c396..06150b3 100644
--- a/src/bp-core/bp-core-adminbar.php
+++ b/src/bp-core/bp-core-adminbar.php
@@ -23,7 +23,7 @@ function bp_admin_bar_my_account_root() {
 	global $wp_admin_bar;
 
 	// Bail if this is an ajax request
-	if ( !bp_use_wp_admin_bar() || defined( 'DOING_AJAX' ) )
+	if ( defined( 'DOING_AJAX' ) )
 		return;
 
 	// Only add menu for logged in user
@@ -44,47 +44,19 @@ function bp_admin_bar_my_account_root() {
 add_action( 'admin_bar_menu', 'bp_admin_bar_my_account_root', 100 );
 
 /**
- * Handle the Toolbar/BuddyBar business.
+ * Maybe show the Toolbar for logged out users.
  *
  * @since BuddyPress (1.2.0)
  *
  * @global string $wp_version
  * @uses bp_get_option()
  * @uses is_user_logged_in()
- * @uses bp_use_wp_admin_bar()
  * @uses show_admin_bar()
- * @uses add_action() To hook 'bp_adminbar_logo' to 'bp_adminbar_logo'.
- * @uses add_action() To hook 'bp_adminbar_login_menu' to 'bp_adminbar_menus'.
- * @uses add_action() To hook 'bp_adminbar_account_menu' to 'bp_adminbar_menus'.
- * @uses add_action() To hook 'bp_adminbar_thisblog_menu' to 'bp_adminbar_menus'.
- * @uses add_action() To hook 'bp_adminbar_random_menu' to 'bp_adminbar_menus'.
- * @uses add_action() To hook 'bp_core_admin_bar' to 'wp_footer'.
- * @uses add_action() To hook 'bp_core_admin_bar' to 'admin_footer'.
  */
 function bp_core_load_admin_bar() {
-
-	// Show the Toolbar for logged out users
 	if ( ! is_user_logged_in() && (int) bp_get_option( 'hide-loggedout-adminbar' ) != 1 ) {
 		show_admin_bar( true );
 	}
-
-	// Hide the WordPress Toolbar and show the BuddyBar
-	if ( ! bp_use_wp_admin_bar() ) {
-
-		// Keep the WP Toolbar from loading
-		show_admin_bar( false );
-
-		// Actions used to build the BP Toolbar
-		add_action( 'bp_adminbar_logo',  'bp_adminbar_logo'               );
-		add_action( 'bp_adminbar_menus', 'bp_adminbar_login_menu',    2   );
-		add_action( 'bp_adminbar_menus', 'bp_adminbar_account_menu',  4   );
-		add_action( 'bp_adminbar_menus', 'bp_adminbar_thisblog_menu', 6   );
-		add_action( 'bp_adminbar_menus', 'bp_adminbar_random_menu',   100 );
-
-		// Actions used to append BP Toolbar to footer
-		add_action( 'wp_footer',    'bp_core_admin_bar', 8 );
-		add_action( 'admin_footer', 'bp_core_admin_bar'    );
-	}
 }
 add_action( 'init', 'bp_core_load_admin_bar', 9 );
 
@@ -96,7 +68,7 @@ add_action( 'init', 'bp_core_load_admin_bar', 9 );
 function bp_core_load_admin_bar_css() {
 	global $wp_styles;
 
-	if ( ! bp_use_wp_admin_bar() || ! is_admin_bar_showing() )
+	if ( ! is_admin_bar_showing() )
 		return;
 
 	$min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
diff --git a/src/bp-core/bp-core-buddybar.php b/src/bp-core/bp-core-buddybar.php
index a307af4..3c1e236 100644
--- a/src/bp-core/bp-core-buddybar.php
+++ b/src/bp-core/bp-core-buddybar.php
@@ -5,7 +5,6 @@
  *
  * @package BuddyPress
  * @subpackage Core
- * @todo Deprecate BuddyBar functions.
  */
 
 // Exit if accessed directly
@@ -556,176 +555,6 @@ function bp_core_reset_subnav_items( $parent_slug ) {
 	unset( $bp->bp_options_nav[$parent_slug] );
 }
 
-/** BuddyBar Template functions ***********************************************/
-
-/**
- * Wrapper function for rendering the BuddyBar.
- *
- * @return bool|null Returns false if the BuddyBar is disabled.
- */
-function bp_core_admin_bar() {
-	global $bp;
-
-	if ( defined( 'BP_DISABLE_ADMIN_BAR' ) && BP_DISABLE_ADMIN_BAR )
-		return false;
-
-	if ( (int) bp_get_option( 'hide-loggedout-adminbar' ) && !is_user_logged_in() )
-		return false;
-
-	$bp->doing_admin_bar = true;
-
-	echo '<div id="wp-admin-bar"><div class="padder">';
-
-	// **** Do bp-adminbar-logo Actions ********
-	do_action( 'bp_adminbar_logo' );
-
-	echo '<ul class="main-nav">';
-
-	// **** Do bp-adminbar-menus Actions ********
-	do_action( 'bp_adminbar_menus' );
-
-	echo '</ul>';
-	echo "</div></div><!-- #wp-admin-bar -->\n\n";
-
-	$bp->doing_admin_bar = false;
-}
-
-/**
- * Output the BuddyBar logo.
- */
-function bp_adminbar_logo() {
-	echo '<a href="' . bp_get_root_domain() . '" id="admin-bar-logo">' . get_blog_option( bp_get_root_blog_id(), 'blogname' ) . '</a>';
-}
-
-/**
- * Output the "Log In" and "Sign Up" names to the BuddyBar.
- *
- * Visible only to visitors who are not logged in.
- *
- * @return bool|null Returns false if the current user is logged in.
- */
-function bp_adminbar_login_menu() {
-
-	if ( is_user_logged_in() )
-		return false;
-
-	echo '<li class="bp-login no-arrow"><a href="' . wp_login_url() . '">' . __( 'Log In', 'buddypress' ) . '</a></li>';
-
-	// Show "Sign Up" link if user registrations are allowed
-	if ( bp_get_signup_allowed() )
-		echo '<li class="bp-signup no-arrow"><a href="' . bp_get_signup_page() . '">' . __( 'Sign Up', 'buddypress' ) . '</a></li>';
-}
-
-/**
- * Output the My Account BuddyBar menu.
- *
- * @return bool|null Returns false on failure.
- */
-function bp_adminbar_account_menu() {
-	global $bp;
-
-	if ( !$bp->bp_nav || !is_user_logged_in() )
-		return false;
-
-	echo '<li id="bp-adminbar-account-menu"><a href="' . bp_loggedin_user_domain() . '">';
-	echo __( 'My Account', 'buddypress' ) . '</a>';
-	echo '<ul>';
-
-	// Loop through each navigation item
-	$counter = 0;
-	foreach( (array) $bp->bp_nav as $nav_item ) {
-		$alt = ( 0 == $counter % 2 ) ? ' class="alt"' : '';
-
-		if ( -1 == $nav_item['position'] )
-			continue;
-
-		echo '<li' . $alt . '>';
-		echo '<a id="bp-admin-' . $nav_item['css_id'] . '" href="' . $nav_item['link'] . '">' . $nav_item['name'] . '</a>';
-
-		if ( isset( $bp->bp_options_nav[$nav_item['slug']] ) && is_array( $bp->bp_options_nav[$nav_item['slug']] ) ) {
-			echo '<ul>';
-			$sub_counter = 0;
-
-			foreach( (array) $bp->bp_options_nav[$nav_item['slug']] as $subnav_item ) {
-				$link = $subnav_item['link'];
-				$name = $subnav_item['name'];
-
-				if ( bp_displayed_user_domain() )
-					$link = str_replace( bp_displayed_user_domain(), bp_loggedin_user_domain(), $subnav_item['link'] );
-
-				if ( isset( $bp->displayed_user->userdata->user_login ) )
-					$name = str_replace( $bp->displayed_user->userdata->user_login, $bp->loggedin_user->userdata->user_login, $subnav_item['name'] );
-
-				$alt = ( 0 == $sub_counter % 2 ) ? ' class="alt"' : '';
-				echo '<li' . $alt . '><a id="bp-admin-' . $subnav_item['css_id'] . '" href="' . $link . '">' . $name . '</a></li>';
-				$sub_counter++;
-			}
-			echo '</ul>';
-		}
-
-		echo '</li>';
-
-		$counter++;
-	}
-
-	$alt = ( 0 == $counter % 2 ) ? ' class="alt"' : '';
-
-	echo '<li' . $alt . '><a id="bp-admin-logout" class="logout" href="' . wp_logout_url( home_url() ) . '">' . __( 'Log Out', 'buddypress' ) . '</a></li>';
-	echo '</ul>';
-	echo '</li>';
-}
-
-function bp_adminbar_thisblog_menu() {
-	if ( current_user_can( 'edit_posts' ) ) {
-		echo '<li id="bp-adminbar-thisblog-menu"><a href="' . admin_url() . '">';
-		_e( 'Dashboard', 'buddypress' );
-		echo '</a>';
-		echo '<ul>';
-
-		echo '<li class="alt"><a href="' . admin_url() . 'post-new.php">' . __( 'New Post', 'buddypress' ) . '</a></li>';
-		echo '<li><a href="' . admin_url() . 'edit.php">' . __( 'Manage Posts', 'buddypress' ) . '</a></li>';
-		echo '<li class="alt"><a href="' . admin_url() . 'edit-comments.php">' . __( 'Manage Comments', 'buddypress' ) . '</a></li>';
-
-		do_action( 'bp_adminbar_thisblog_items' );
-
-		echo '</ul>';
-		echo '</li>';
-	}
-}
-
-/**
- * Output the Random BuddyBar menu.
- *
- * Not visible for logged-in users.
- */
-function bp_adminbar_random_menu() {
-?>
-
-	<li class="align-right" id="bp-adminbar-visitrandom-menu">
-		<a href="#"><?php _e( 'Visit', 'buddypress' ) ?></a>
-		<ul class="random-list">
-			<li><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() ) . '?random-member' ?>" rel="nofollow"><?php _e( 'Random Member', 'buddypress' ) ?></a></li>
-
-			<?php if ( bp_is_active( 'groups' ) ) : ?>
-
-				<li class="alt"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() ) . '?random-group' ?>"  rel="nofollow"><?php _e( 'Random Group', 'buddypress' ) ?></a></li>
-
-			<?php endif; ?>
-
-			<?php if ( is_multisite() && bp_is_active( 'blogs' ) ) : ?>
-
-				<li><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() ) . '?random-blog' ?>"  rel="nofollow"><?php _e( 'Random Site', 'buddypress' ) ?></a></li>
-
-			<?php endif; ?>
-
-			<?php do_action( 'bp_adminbar_random_menu' ) ?>
-
-		</ul>
-	</li>
-
-	<?php
-}
-
 /**
  * Retrieve the Toolbar display preference of a user based on context.
  *
@@ -746,28 +575,4 @@ function bp_get_admin_bar_pref( $context, $user = 0 ) {
 		return true;
 
 	return 'true' === $pref;
-}
-
-/**
- * Enqueue the BuddyBar CSS.
- */
-function bp_core_load_buddybar_css() {
-	global $wp_styles;
-
-	if ( bp_use_wp_admin_bar() || ( (int) bp_get_option( 'hide-loggedout-adminbar' ) && !is_user_logged_in() ) || ( defined( 'BP_DISABLE_ADMIN_BAR' ) && BP_DISABLE_ADMIN_BAR ) )
-		return;
-
-	$min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-
-	if ( file_exists( get_stylesheet_directory() . '/_inc/css/adminbar.css' ) ) { // Backwards compatibility
-		$stylesheet = get_stylesheet_directory_uri() . '/_inc/css/adminbar.css';
-	} else {
-		$stylesheet = buddypress()->plugin_url . "bp-core/css/buddybar{$min}.css";
-	}
-
-	wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_buddybar_rtl_css', $stylesheet ), array(), bp_get_version() );
-	$wp_styles->add_data( 'bp-admin-bar', 'rtl', true );
-	if ( $min )
-		$wp_styles->add_data( 'bp-admin-bar', 'suffix', $min );
-}
-add_action( 'bp_init', 'bp_core_load_buddybar_css' );
+}
\ No newline at end of file
diff --git a/src/bp-core/bp-core-component.php b/src/bp-core/bp-core-component.php
index c16c17c..f7fba2b 100644
--- a/src/bp-core/bp-core-component.php
+++ b/src/bp-core/bp-core-component.php
@@ -429,10 +429,6 @@ class BP_Component {
 		if ( defined( 'DOING_AJAX' ) )
 			return;
 
-		// Do not proceed if BP_USE_WP_ADMIN_BAR constant is not set or is false
-		if ( !bp_use_wp_admin_bar() )
-			return;
-
 		// Filter the passed admin nav
 		$wp_admin_nav = apply_filters( 'bp_' . $this->id . '_admin_nav', $wp_admin_nav );
 
diff --git a/src/bp-core/bp-core-dependency.php b/src/bp-core/bp-core-dependency.php
index eaf839c..2c2b1d2 100644
--- a/src/bp-core/bp-core-dependency.php
+++ b/src/bp-core/bp-core-dependency.php
@@ -49,8 +49,7 @@ function bp_setup_nav() {
  * Fire the 'bp_setup_admin_bar' action, where plugins should add items to the WP admin bar.
  */
 function bp_setup_admin_bar() {
-	if ( bp_use_wp_admin_bar() )
-		do_action( 'bp_setup_admin_bar' );
+	do_action( 'bp_setup_admin_bar' );
 }
 
 /**
diff --git a/src/bp-core/bp-core-functions.php b/src/bp-core/bp-core-functions.php
index c22b882..28cd529 100644
--- a/src/bp-core/bp-core-functions.php
+++ b/src/bp-core/bp-core-functions.php
@@ -308,8 +308,7 @@ function bp_is_username_compatibility_mode() {
 /**
  * Should we use the WP Toolbar?
  *
- * The WP Toolbar, introduced in WP 3.1, is fully supported in BuddyPress as
- * of BP 1.5. For BP 1.6, the WP Toolbar is the default.
+ * The WP Toolbar, introduced in WP 3.1, is fully supported in BuddyPress as of BP 1.5.
  *
  * @since BuddyPress (1.5.0)
  *
@@ -319,17 +318,7 @@ function bp_is_username_compatibility_mode() {
  *        Default: true.
  */
 function bp_use_wp_admin_bar() {
-	$use_admin_bar = true;
-
-	// Has the WP Toolbar constant been explicity set?
-	if ( defined( 'BP_USE_WP_ADMIN_BAR' ) && ! BP_USE_WP_ADMIN_BAR )
-		$use_admin_bar = false;
-
-	// Has the admin chosen to use the BuddyBar during an upgrade?
-	elseif ( (bool) bp_get_option( '_bp_force_buddybar', false ) )
-		$use_admin_bar = false;
-
-	return apply_filters( 'bp_use_wp_admin_bar', $use_admin_bar );
+	return apply_filters( 'bp_use_wp_admin_bar', true );
 }
 
 /** Directory *****************************************************************/
diff --git a/src/bp-core/bp-core-options.php b/src/bp-core/bp-core-options.php
index 8fe2eff..cc3453b 100644
--- a/src/bp-core/bp-core-options.php
+++ b/src/bp-core/bp-core-options.php
@@ -81,11 +81,6 @@ function bp_get_default_options() {
 		// HeartBeat is on to refresh activities
 		'_bp_enable_heartbeat_refresh'    => true,
 
-		/** BuddyBar **********************************************************/
-
-		// Force the BuddyBar
-		'_bp_force_buddybar'              => false,
-
 		/** Legacy theme *********************************************/
 
 		// Whether to register the bp-default themes directory
@@ -521,21 +516,6 @@ function bp_restrict_group_creation( $default = true ) {
 }
 
 /**
- * Should the old BuddyBar be forced in place of the WP admin bar?
- *
- * @since BuddyPress (1.6.0)
- *
- * @uses bp_get_option() To get the BuddyBar option.
- *
- * @param bool $default Optional. Fallback value if not found in the database.
- *        Default: true.
- * @return bool True if the BuddyBar should be forced on, otherwise false.
- */
-function bp_force_buddybar( $default = true ) {
-	return (bool) apply_filters( 'bp_force_buddybar', (bool) bp_get_option( '_bp_force_buddybar', $default ) );
-}
-
-/**
  * Output the group forums root parent forum id.
  *
  * @since BuddyPress (1.6.0)
diff --git a/src/bp-core/css/buddybar-rtl.css b/src/bp-core/css/buddybar-rtl.css
deleted file mode 100644
index 67f5dcc..0000000
--- a/src/bp-core/css/buddybar-rtl.css
+++ /dev/null
@@ -1,203 +0,0 @@
-body:not(.wp-admin) {
-	padding-top: 25px !important;
-}
-#wp-admin-bar {
-	position: fixed;
-	top: 0;
-	right: 0;
-	height: 25px;
-	font-size: 11px;
-	width: 100%;
-	z-index: 9999;
-}
-#wp-admin-bar .padder {
-	position: relative;
-	padding: 0;
-	width: 100%;
-	margin: 0 auto;
-	background: url('../images/60pc_black.png');
-	height: 25px;
-}
-body#bp-default #wp-admin-bar .padder {
-	max-width: 1250px;
-}
-#wp-admin-bar * {
-	z-index: 999;
-}
-#wp-admin-bar div#admin-bar-logo {
-	position: absolute;
-	top: 5px;
-	right: 10px;
-}
-#wp-admin-bar a img {
-	border: none;
-}
-#wp-admin-bar li {
-	list-style: none;
-	margin: 0;
-	padding: 0;
-	line-height: 100%;
-	text-align: right;
-}
-#wp-admin-bar li a {
-	padding: 7px 15px 7px 15px;
-	color: #eee;
-	text-decoration: none;
-	font-size: 11px;
-}
-#wp-admin-bar li.alt {
-	border: none;
-}
-#wp-admin-bar li.no-arrow a {
-	padding-left: 15px;
-}
-#wp-admin-bar ul li ul li a span {
-	display: none;
-}
-#wp-admin-bar li:hover,
-#wp-admin-bar li.hover {
-	position: static;
-}
-#admin-bar-logo {
-	float: right;
-	font-weight: bold;
-	font-size: 11px;
-	padding: 5px 8px;
-	margin: 0;
-	text-decoration: none;
-	color: #fff;
-}
-body#bp-default #admin-bar-logo {
-	padding: 2px 8px;
-}
-
-/* all lists */
-#wp-admin-bar ul {
-	margin: 0;
-	list-style: none;
-	line-height: 1;
-	cursor: pointer;
-	height: auto;
-	padding: 0;
-}
-
-/* all list items */
-#wp-admin-bar ul li {
-	padding: 0;
-	float: right;
-	position: relative;
-	background: url('../images/admin-menu-arrow.gif') 12% 53% no-repeat;
-	padding-left: 11px;
-}
-#wp-admin-bar ul li.no-arrow {
-	background: none;
-	padding-left: 0;
-}
-#wp-admin-bar ul li ul li {
-	background-image: none;
-}
-#wp-admin-bar ul li.align-right {
-	position: absolute;
-	left: 0;
-}
-#wp-admin-bar ul li a {
-	display: block;
-}
-#wp-admin-bar ul.main-nav li:hover,
-#wp-admin-bar ul.main-nav li.sfhover,
-#wp-admin-bar ul.main-nav li ul li.sfhover {
-	background-color: #333;
-}
-
-/* second-level lists */
-#wp-admin-bar ul li ul {
-	position: absolute;
-	width: 185px;
-	right: -999em;
-	margin-right: 0;
-	background: #333;
-	border: 1px solid #222;
-	-moz-box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-	-webkit-box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	-moz-border-radius-topleft: 0;
-	-webkit-border-top-right-radius: 0;
-	-moz-border-radius-topright: 0;
-	-webkit-border-top-left-radius: 0;
-}
-#wp-admin-bar ul li > ul {
-	border-top: none;
-}
-#wp-admin-bar ul li ul a {
-	color: #eee;
-}
-#wp-admin-bar ul li ul li {
-	float: right;
-	width: 174px;
-	margin: 0;
-}
-#wp-admin-bar ul li ul li:hover a {
-	color: #fff;
-}
-#wp-admin-bar ul li div.admin-bar-clear {
-	clear: both;
-}
-#wp-admin-bar ul.main-nav li ul li:hover,
-#wp-admin-bar ul.main-nav li ul li.sfhover,
-#wp-admin-bar ul.main-nav li ul li.sfhover {
-	background-color: #222;
-}
-
-/* third-and-above-level lists */
-#wp-admin-bar ul li ul ul {
-	margin: -25px 184px 0 0;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-}
-#wp-admin-bar ul li ul li:hover ul li a {
-	color: #eee;
-}
-#wp-admin-bar ul li ul li ul li:hover a {
-	color: #fff;
-}
-#wp-admin-bar ul li:hover ul,
-#wp-admin-bar ul li ul li:hover ul,
-#wp-admin-bar ul li.sfhover ul,
-#wp-admin-bar ul li ul li.sfhover ul {
-	right: auto;
-}
-#wp-admin-bar ul li.align-right:hover ul {
-	left: 0;
-}
-#wp-admin-bar ul li:hover ul ul,
-#wp-admin-bar li.sfhover ul li ul {
-	right: -999em;
-}
-
-/* Menu item css */
-#wp-admin-bar img.avatar {
-	float: right;
-	margin-left: 8px;
-}
-#wp-admin-bar span.activity {
-	display: block;
-	margin-right: 34px;
-	padding: 0;
-}
-#wp-admin-bar ul.author-list li a {
-	height: 17px;
-}
-#wp-admin-bar ul li#bp-adminbar-notifications-menu a span {
-	padding: 0 6px;
-	margin-right: 2px;
-	background: #fff;
-	color: #000;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
-#wp-admin-bar-user-info img.avatar { 
-	height: 64px; 
-	width: 64px; 
-}
\ No newline at end of file
diff --git a/src/bp-core/css/buddybar.css b/src/bp-core/css/buddybar.css
deleted file mode 100644
index a53920f..0000000
--- a/src/bp-core/css/buddybar.css
+++ /dev/null
@@ -1,203 +0,0 @@
-body:not(.wp-admin) {
-	padding-top: 25px !important;
-}
-#wp-admin-bar {
-	position: fixed;
-	top: 0;
-	left: 0;
-	height: 25px;
-	font-size: 11px;
-	width: 100%;
-	z-index: 9999;
-}
-#wp-admin-bar .padder {
-	position: relative;
-	padding: 0;
-	width: 100%;
-	margin: 0 auto;
-	background: url('../images/60pc_black.png');
-	height: 25px;
-}
-body#bp-default #wp-admin-bar .padder {
-	max-width: 1250px;
-}
-#wp-admin-bar * {
-	z-index: 999;
-}
-#wp-admin-bar div#admin-bar-logo {
-	position: absolute;
-	top: 5px;
-	left: 10px;
-}
-#wp-admin-bar a img {
-	border: none;
-}
-#wp-admin-bar li {
-	list-style: none;
-	margin: 0;
-	padding: 0;
-	line-height: 100%;
-	text-align: left;
-}
-#wp-admin-bar li a {
-	padding: 7px 15px 7px 15px;
-	color: #eee;
-	text-decoration: none;
-	font-size: 11px;
-}
-#wp-admin-bar li.alt {
-	border: none;
-}
-#wp-admin-bar li.no-arrow a {
-	padding-right: 15px;
-}
-#wp-admin-bar ul li ul li a span {
-	display: none;
-}
-#wp-admin-bar li:hover,
-#wp-admin-bar li.hover {
-	position: static;
-}
-#admin-bar-logo {
-	float: left;
-	font-weight: bold;
-	font-size: 11px;
-	padding: 5px 8px;
-	margin: 0;
-	text-decoration: none;
-	color: #fff;
-}
-body#bp-default #admin-bar-logo {
-	padding: 2px 8px;
-}
-
-/* all lists */
-#wp-admin-bar ul {
-	margin: 0;
-	list-style: none;
-	line-height: 1;
-	cursor: pointer;
-	height: auto;
-	padding: 0;
-}
-
-/* all list items */
-#wp-admin-bar ul li {
-	padding: 0;
-	float: left;
-	position: relative;
-	background: url('../images/admin-menu-arrow.gif') 88% 53% no-repeat;
-	padding-right: 11px;
-}
-#wp-admin-bar ul li.no-arrow {
-	background: none;
-	padding-right: 0;
-}
-#wp-admin-bar ul li ul li {
-	background-image: none;
-}
-#wp-admin-bar ul li.align-right {
-	position: absolute;
-	right: 0;
-}
-#wp-admin-bar ul li a {
-	display: block;
-}
-#wp-admin-bar ul.main-nav li:hover,
-#wp-admin-bar ul.main-nav li.sfhover,
-#wp-admin-bar ul.main-nav li ul li.sfhover {
-	background-color: #333;
-}
-
-/* second-level lists */
-#wp-admin-bar ul li ul {
-	position: absolute;
-	width: 185px;
-	left: -999em;
-	margin-left: 0;
-	background: #333;
-	border: 1px solid #222;
-	-moz-box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-	-webkit-box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	-moz-border-radius-topleft: 0;
-	-webkit-border-top-left-radius: 0;
-	-moz-border-radius-topright: 0;
-	-webkit-border-top-right-radius: 0;
-}
-#wp-admin-bar ul li > ul {
-	border-top: none;
-}
-#wp-admin-bar ul li ul a {
-	color: #eee;
-}
-#wp-admin-bar ul li ul li {
-	float: left;
-	width: 174px;
-	margin: 0;
-}
-#wp-admin-bar ul li ul li:hover a {
-	color: #fff;
-}
-#wp-admin-bar ul li div.admin-bar-clear {
-	clear: both;
-}
-#wp-admin-bar ul.main-nav li ul li:hover,
-#wp-admin-bar ul.main-nav li ul li.sfhover,
-#wp-admin-bar ul.main-nav li ul li.sfhover {
-	background-color: #222;
-}
-
-/* third-and-above-level lists */
-#wp-admin-bar ul li ul ul {
-	margin: -25px 0 0 184px;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-}
-#wp-admin-bar ul li ul li:hover ul li a {
-	color: #eee;
-}
-#wp-admin-bar ul li ul li ul li:hover a {
-	color: #fff;
-}
-#wp-admin-bar ul li:hover ul,
-#wp-admin-bar ul li ul li:hover ul,
-#wp-admin-bar ul li.sfhover ul,
-#wp-admin-bar ul li ul li.sfhover ul {
-	left: auto;
-}
-#wp-admin-bar ul li.align-right:hover ul {
-	right: 0;
-}
-#wp-admin-bar ul li:hover ul ul,
-#wp-admin-bar li.sfhover ul li ul {
-	left: -999em;
-}
-
-/* Menu item css */
-#wp-admin-bar img.avatar {
-	float: left;
-	margin-right: 8px;
-}
-#wp-admin-bar span.activity {
-	display: block;
-	margin-left: 34px;
-	padding: 0;
-}
-#wp-admin-bar ul.author-list li a {
-	height: 17px;
-}
-#wp-admin-bar ul li#bp-adminbar-notifications-menu a span {
-	padding: 0 6px;
-	margin-left: 2px;
-	background: #fff;
-	color: #000;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
-#wp-admin-bar-user-info img.avatar { 
-	height: 64px; 
-	width: 64px; 
-}
\ No newline at end of file
diff --git a/src/bp-core/deprecated/2.1.php b/src/bp-core/deprecated/2.1.php
index a6b8133..baaa4fa 100644
--- a/src/bp-core/deprecated/2.1.php
+++ b/src/bp-core/deprecated/2.1.php
@@ -54,4 +54,157 @@ function bp_core_register_deprecated_styles() {
 		wp_register_style( $id, $url . $file . $ext, array(), bp_get_version() );
 	}
 }
-add_action( 'bp_enqueue_scripts', 'bp_core_register_deprecated_styles', 1 );
\ No newline at end of file
+add_action( 'bp_enqueue_scripts', 'bp_core_register_deprecated_styles', 1 );
+
+/**
+ * Enqueue the BuddyBar CSS.
+ *
+ * @deprecated BuddyPress (2.1.0)
+ */
+function bp_core_load_buddybar_css() {
+	_deprecated_function( __FUNCTION__, '2.1', 'No longer used.' );
+}
+
+/**
+ * Output the BuddyBar logo.
+ *
+ * @deprecated BuddyPress (2.1.0)
+ */
+function bp_adminbar_logo() {
+	_deprecated_function( __FUNCTION__, '2.1', 'No longer used.' );
+}
+
+/**
+ * Output the "Log In" and "Sign Up" names to the BuddyBar.
+ *
+ * @deprecated BuddyPress (2.1.0)
+ */
+function bp_adminbar_login_menu() {
+	_deprecated_function( __FUNCTION__, '2.1', 'No longer used.' );
+}
+
+/**
+ * Output the My Account BuddyBar menu.
+ *
+ * @deprecated BuddyPress (2.1.0)
+ */
+function bp_adminbar_account_menu() {
+	_deprecated_function( __FUNCTION__, '2.1', 'No longer used.' );
+}
+
+/**
+ * @deprecated BuddyPress (2.1.0)
+ */
+function bp_adminbar_thisblog_menu() {
+	_deprecated_function( __FUNCTION__, '2.1', 'No longer used.' );
+}
+
+/**
+ * Output the Random BuddyBar menu.
+ *
+ * @deprecated BuddyPress (2.1.0)
+ */
+function bp_adminbar_random_menu() {
+	_deprecated_function( __FUNCTION__, '2.1', 'No longer used.' );
+}
+
+/**
+ * Wrapper function for rendering the BuddyBar.
+ *
+ * @deprecated BuddyPress (2.1.0)
+ */
+function bp_core_admin_bar() {
+	_deprecated_function( __FUNCTION__, '2.1', 'No longer used.' );
+}
+
+/**
+ * Add a Sites menu to the BuddyBar.
+ *
+ * @deprecated BuddyPress (2.1.0)
+ * @since BuddyPress (1.0.0)
+ */
+function bp_adminbar_blogs_menu() {
+	_deprecated_function( __FUNCTION__, '2.1', 'No longer used.' );
+}
+
+/**
+ * Add menu items to the BuddyBar.
+ *
+ * @deprecated BuddyPress (2.1.0)
+ * @since BuddyPress (1.0.0)
+ */
+function bp_groups_adminbar_admin_menu() {
+	_deprecated_function( __FUNCTION__, '2.1', 'No longer used.' );
+}
+
+/**
+ * Add the Notifications menu to the BuddyBar.
+ *
+ * @deprecated BuddyPress (2.1.0)
+ */
+function bp_adminbar_notifications_menu() {
+	_deprecated_function( __FUNCTION__, '2.1', 'No longer used.' );
+}
+
+/**
+ * Add the Blog Authors menu to the BuddyBar (visible when not logged in).
+ *
+ * @deprecated BuddyPress (2.1.0)
+ */
+function bp_adminbar_authors_menu() {
+	_deprecated_function( __FUNCTION__, '2.1', 'No longer used.' );
+}
+
+/**
+ * Add a member admin menu to the BuddyBar.
+ *
+ * @deprecated BuddyPress (2.1.0)
+ */
+function bp_members_adminbar_admin_menu() {
+	_deprecated_function( __FUNCTION__, '2.1', 'No longer used.' );
+}
+
+/**
+ * Create the Notifications menu for the BuddyBar.
+ *
+ * @deprecated BuddyPress (2.1.0)
+ * @since BuddyPress (1.9.0)
+ */
+function bp_notifications_buddybar_menu() {
+	_deprecated_function( __FUNCTION__, '2.1', 'No longer used.' );
+}
+
+/**
+ * Should the old BuddyBar be forced in place of the WP admin bar?
+ *
+ * @param bool $deprecated Deprecated parameter. Not used.
+ * @return bool True if the BuddyBar should be forced on, otherwise false.
+ * @since BuddyPress (1.6.0)
+ */
+function bp_force_buddybar( $deprecated = true ) {
+	_deprecated_function( __FUNCTION__, '2.1', 'No longer used.' );
+	return false;
+}
+
+/**
+ * If user has upgraded to 1.6 and chose to retain their BuddyBar, offer them a switch to change over
+ * to the WP Toolbar.
+ *
+ * @deprecated BuddyPress (2.1.0)
+ * @since BuddyPress (1.6)
+ */
+function bp_admin_setting_callback_force_buddybar() {
+	_deprecated_function( __FUNCTION__, '2.1', 'No longer used.' );
+}
+
+/**
+ * Sanitization for _bp_force_buddybar
+ *
+ * @access Private
+ * @return in
+ * @since BuddyPress (1.6)
+ */
+function bp_admin_sanitize_callback_force_buddybar( $value = false ) {
+	_deprecated_function( __FUNCTION__, '2.1', 'No longer used.' );
+	return 0;
+}
diff --git a/src/bp-core/images/60pc_black.png b/src/bp-core/images/60pc_black.png
deleted file mode 100644
index d5d91f0..0000000
Binary files a/src/bp-core/images/60pc_black.png and /dev/null differ
diff --git a/src/bp-core/images/admin-menu-arrow.gif b/src/bp-core/images/admin-menu-arrow.gif
deleted file mode 100644
index 3d8299f..0000000
Binary files a/src/bp-core/images/admin-menu-arrow.gif and /dev/null differ
diff --git a/src/bp-groups/bp-groups-buddybar.php b/src/bp-groups/bp-groups-buddybar.php
deleted file mode 100644
index 6ce1764..0000000
--- a/src/bp-groups/bp-groups-buddybar.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * BuddyPress Groups BuddyBar
- *
- * @package BuddyPress
- * @subpackage GroupsBuddyBar
- */
-
-// Exit if accessed directly
-if ( !defined( 'ABSPATH' ) ) exit;
-
-/**
- * Add menu items to the BuddyBar.
- *
- * @since BuddyPress (1.0.0)
- *
- * @global BuddyPress $bp
- */
-function bp_groups_adminbar_admin_menu() {
-	global $bp;
-
-	if ( empty( $bp->groups->current_group ) )
-		return false;
-
-	// Only group admins and site admins can see this menu
-	if ( !current_user_can( 'edit_users' ) && !bp_current_user_can( 'bp_moderate' ) && !bp_is_item_admin() )
-		return false; ?>
-
-	<li id="bp-adminbar-adminoptions-menu">
-		<a href="<?php bp_groups_action_link( 'admin' ); ?>"><?php _e( 'Admin Options', 'buddypress' ); ?></a>
-
-		<ul>
-			<li><a href="<?php bp_groups_action_link( 'admin/edit-details' ); ?>"><?php _e( 'Edit Details', 'buddypress' ); ?></a></li>
-
-			<li><a href="<?php bp_groups_action_link( 'admin/group-settings' );  ?>"><?php _e( 'Group Settings', 'buddypress' ); ?></a></li>
-
-			<?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
-
-				<li><a href="<?php bp_groups_action_link( 'admin/group-avatar' ); ?>"><?php _e( 'Group Avatar', 'buddypress' ); ?></a></li>
-
-			<?php endif; ?>
-
-			<?php if ( bp_is_active( 'friends' ) ) : ?>
-
-				<li><a href="<?php bp_groups_action_link( 'send-invites' ); ?>"><?php _e( 'Manage Invitations', 'buddypress' ); ?></a></li>
-
-			<?php endif; ?>
-
-			<li><a href="<?php bp_groups_action_link( 'admin/manage-members' ); ?>"><?php _e( 'Manage Members', 'buddypress' ); ?></a></li>
-
-			<?php if ( $bp->groups->current_group->status == 'private' ) : ?>
-
-				<li><a href="<?php bp_groups_action_link( 'admin/membership-requests' ); ?>"><?php _e( 'Membership Requests', 'buddypress' ); ?></a></li>
-
-			<?php endif; ?>
-
-			<li><a class="confirm" href="<?php echo wp_nonce_url( bp_get_group_permalink( $bp->groups->current_group ) . 'admin/delete-group/', 'groups_delete_group' ); ?>&amp;delete-group-button=1&amp;delete-group-understand=1"><?php _e( "Delete Group", 'buddypress' ) ?></a></li>
-
-			<?php do_action( 'bp_groups_adminbar_admin_menu' ) ?>
-
-		</ul>
-	</li>
-
-	<?php
-}
-add_action( 'bp_adminbar_menus', 'bp_groups_adminbar_admin_menu', 20 );
diff --git a/src/bp-groups/bp-groups-loader.php b/src/bp-groups/bp-groups-loader.php
index 0086696..9dbc3f2 100644
--- a/src/bp-groups/bp-groups-loader.php
+++ b/src/bp-groups/bp-groups-loader.php
@@ -102,7 +102,6 @@ class BP_Groups_Component extends BP_Component {
 			'widgets',
 			'activity',
 			'template',
-			'buddybar',
 			'adminbar',
 			'functions',
 			'notifications'
@@ -350,7 +349,7 @@ class BP_Groups_Component extends BP_Component {
 	}
 
 	/**
-	 * Setup BuddyBar navigation
+	 * Set up navigation
 	 *
 	 * @global BuddyPress $bp The one true BuddyPress instance
 	 */
diff --git a/src/bp-groups/bp-groups-notifications.php b/src/bp-groups/bp-groups-notifications.php
index 8f50541..b3398b2 100644
--- a/src/bp-groups/bp-groups-notifications.php
+++ b/src/bp-groups/bp-groups-notifications.php
@@ -309,7 +309,7 @@ To view %5$s\'s profile visit: %6$s
 /** Notifications *************************************************************/
 
 /**
- * Format the BuddyBar/Toolbar notifications for the Groups component
+ * Format the Toolbar notifications for the Groups component
  *
  * @since BuddyPress (1.0)
  * @param string $action The kind of notification being rendered
diff --git a/src/bp-members/bp-members-buddybar.php b/src/bp-members/bp-members-buddybar.php
deleted file mode 100644
index 2b3217c..0000000
--- a/src/bp-members/bp-members-buddybar.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-/**
- * BuddyPress Members BuddyBar
- *
- * Handles the member functions related to the BuddyBar.
- *
- * @package BuddyPress
- * @subpackage MembersBuddyBar
- */
-
-// Exit if accessed directly
-if ( !defined( 'ABSPATH' ) ) exit;
-
-/**
- * Add the Notifications menu to the BuddyBar.
- */
-function bp_adminbar_notifications_menu() {
-
-	// Bail if notifications is not active
-	if ( ! bp_is_active( 'notifications' ) ) {
-		return false;
-	}
-
-	bp_notifications_buddybar_menu();
-}
-add_action( 'bp_adminbar_menus', 'bp_adminbar_notifications_menu', 8 );
-
-/**
- * Add the Blog Authors menu to the BuddyBar (visible when not logged in).
- */
-function bp_adminbar_authors_menu() {
-	global $wpdb;
-
-	// Only for multisite
-	if ( !is_multisite() )
-		return false;
-
-	// Hide on root blog
-	if ( $wpdb->blogid == bp_get_root_blog_id() || !bp_is_active( 'blogs' ) )
-		return false;
-
-	$blog_prefix = $wpdb->get_blog_prefix( $wpdb->blogid );
-	$authors     = $wpdb->get_results( "SELECT user_id, user_login, user_nicename, display_name, user_email, meta_value as caps FROM $wpdb->users u, $wpdb->usermeta um WHERE u.ID = um.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY um.user_id" );
-
-	if ( !empty( $authors ) ) {
-		// This is a blog, render a menu with links to all authors
-		echo '<li id="bp-adminbar-authors-menu"><a href="/">';
-		_e('Blog Authors', 'buddypress');
-		echo '</a>';
-
-		echo '<ul class="author-list">';
-		foreach( (array) $authors as $author ) {
-			$caps = maybe_unserialize( $author->caps );
-			if ( isset( $caps['subscriber'] ) || isset( $caps['contributor'] ) ) continue;
-
-			echo '<li>';
-			echo '<a href="' . bp_core_get_user_domain( $author->user_id, $author->user_nicename, $author->user_login ) . '">';
-			echo bp_core_fetch_avatar( array(
-				'item_id' => $author->user_id,
-				'email'   => $author->user_email,
-				'width'   => 15,
-				'height'  => 15,
-				'alt'     => sprintf( __( 'Profile picture of %s', 'buddypress' ), $author->display_name )
-			) );
- 			echo ' ' . $author->display_name . '</a>';
-			echo '<div class="admin-bar-clear"></div>';
-			echo '</li>';
-		}
-		echo '</ul>';
-		echo '</li>';
-	}
-}
-add_action( 'bp_adminbar_menus', 'bp_adminbar_authors_menu', 12 );
-
-/**
- * Add a member admin menu to the BuddyBar.
- *
- * Adds an Toolbar menu to any profile page providing site moderator actions
- * that allow capable users to clean up a users account.
- */
-function bp_members_adminbar_admin_menu() {
-
-	// Only show if viewing a user
-	if ( !bp_displayed_user_id() )
-		return false;
-
-	// Don't show this menu to non site admins or if you're viewing your own profile
-	if ( !current_user_can( 'edit_users' ) || bp_is_my_profile() )
-		return false; ?>
-
-	<li id="bp-adminbar-adminoptions-menu">
-
-		<a href=""><?php _e( 'Admin Options', 'buddypress' ) ?></a>
-
-		<ul>
-			<?php if ( bp_is_active( 'xprofile' ) ) : ?>
-
-				<li><a href="<?php bp_members_component_link( 'profile', 'edit' ); ?>"><?php printf( __( "Edit %s's Profile", 'buddypress' ), esc_attr( bp_get_displayed_user_fullname() ) ) ?></a></li>
-
-			<?php endif ?>
-
-			<li><a href="<?php bp_members_component_link( 'profile', 'change-avatar' ); ?>"><?php printf( __( "Edit %s's Avatar", 'buddypress' ), esc_attr( bp_get_displayed_user_fullname() ) ) ?></a></li>
-
-			<li><a href="<?php bp_members_component_link( 'settings', 'capabilities' ); ?>"><?php _e( 'User Capabilities', 'buddypress' ); ?></a></li>
-
-			<li><a href="<?php bp_members_component_link( 'settings', 'delete-account' ); ?>"><?php printf( __( "Delete %s's Account", 'buddypress' ), esc_attr( bp_get_displayed_user_fullname() ) ); ?></a></li>
-
-			<?php do_action( 'bp_members_adminbar_admin_menu' ) ?>
-
-		</ul>
-	</li>
-
-	<?php
-}
-add_action( 'bp_adminbar_menus', 'bp_members_adminbar_admin_menu', 20 );
diff --git a/src/bp-members/bp-members-loader.php b/src/bp-members/bp-members-loader.php
index 2685000..9741d94 100644
--- a/src/bp-members/bp-members-loader.php
+++ b/src/bp-members/bp-members-loader.php
@@ -44,7 +44,6 @@ class BP_Members_Component extends BP_Component {
 			'filters',
 			'screens',
 			'template',
-			'buddybar',
 			'adminbar',
 			'functions',
 			'notifications',
diff --git a/src/bp-messages/bp-messages-notifications.php b/src/bp-messages/bp-messages-notifications.php
index bb0118f..912605b 100644
--- a/src/bp-messages/bp-messages-notifications.php
+++ b/src/bp-messages/bp-messages-notifications.php
@@ -108,7 +108,7 @@ add_action( 'messages_message_sent', 'messages_notification_new_message', 10 );
 /** Notifications *************************************************************/
 
 /**
- * Format the BuddyBar/Toolbar notifications for the Messages component.
+ * Format the Toolbar notifications for the Messages component.
  *
  * @since BuddyPress (1.0.0)
  *
diff --git a/src/bp-notifications/bp-notifications-buddybar.php b/src/bp-notifications/bp-notifications-buddybar.php
deleted file mode 100644
index d49bd94..0000000
--- a/src/bp-notifications/bp-notifications-buddybar.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * BuddyPress Notifications Navigational Functions.
- *
- * Sets up navigation elements, including BuddyBar functionality, for the
- * Notifications component.
- *
- * @package BuddyPress
- * @subpackage NotificationsBuddyBar
- */
-
-// Exit if accessed directly
-if ( !defined( 'ABSPATH' ) ) exit;
-
-/**
- * Create the Notifications menu for the BuddyBar.
- *
- * @since BuddyPress (1.9.0)
- */
-function bp_notifications_buddybar_menu() {
-
-	if ( ! is_user_logged_in() ) {
-		return false;
-	}
-
-	echo '<li id="bp-adminbar-notifications-menu"><a href="' . esc_url( bp_loggedin_user_domain() ) . '">';
-	_e( 'Notifications', 'buddypress' );
-
-	if ( $notification_count = bp_notifications_get_unread_notification_count( bp_loggedin_user_id() ) ) : ?>
-		<span><?php echo bp_core_number_format( $notification_count ); ?></span>
-	<?php
-	endif;
-
-	echo '</a>';
-	echo '<ul>';
-
-	if ( $notifications = bp_notifications_get_notifications_for_user( bp_loggedin_user_id() ) ) {
-		$counter = 0;
-		for ( $i = 0, $count = count( $notifications ); $i < $count; ++$i ) {
-			$alt = ( 0 == $counter % 2 ) ? ' class="alt"' : ''; ?>
-
-			<li<?php echo $alt ?>><?php echo $notifications[$i] ?></li>
-
-			<?php $counter++;
-		}
-	} else { ?>
-
-		<li><a href="<?php echo esc_url( bp_loggedin_user_domain() ); ?>"><?php _e( 'No new notifications.', 'buddypress' ); ?></a></li>
-
-	<?php
-	}
-
-	echo '</ul>';
-	echo '</li>';
-}
-add_action( 'bp_adminbar_menus', 'bp_adminbar_notifications_menu', 8 );
diff --git a/src/bp-notifications/bp-notifications-loader.php b/src/bp-notifications/bp-notifications-loader.php
index ab44069..8dde6f1 100644
--- a/src/bp-notifications/bp-notifications-loader.php
+++ b/src/bp-notifications/bp-notifications-loader.php
@@ -46,7 +46,6 @@ class BP_Notifications_Component extends BP_Component {
 			'classes',
 			'screens',
 			'adminbar',
-			'buddybar',
 			'template',
 			'functions',
 			'cache',
diff --git a/src/bp-settings/bp-settings-loader.php b/src/bp-settings/bp-settings-loader.php
index 8d97f5a..0b6f0c9 100644
--- a/src/bp-settings/bp-settings-loader.php
+++ b/src/bp-settings/bp-settings-loader.php
@@ -64,7 +64,7 @@ class BP_Settings_Component extends BP_Component {
 	}
 
 	/**
-	 * Setup BuddyBar navigation
+	 * Set up navigation
 	 */
 	public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
 
diff --git a/src/bp-xprofile/bp-xprofile-buddybar.php b/src/bp-xprofile/bp-xprofile-buddybar.php
deleted file mode 100644
index 1cd870d..0000000
--- a/src/bp-xprofile/bp-xprofile-buddybar.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-// Exit if accessed directly
-if ( !defined( 'ABSPATH' ) ) exit;
diff --git a/src/bp-xprofile/bp-xprofile-loader.php b/src/bp-xprofile/bp-xprofile-loader.php
index f8b5c91..84d552d 100644
--- a/src/bp-xprofile/bp-xprofile-loader.php
+++ b/src/bp-xprofile/bp-xprofile-loader.php
@@ -63,7 +63,6 @@ class BP_XProfile_Component extends BP_Component {
 			'filters',
 			'settings',
 			'template',
-			'buddybar',
 			'functions',
 		);
 
@@ -156,7 +155,7 @@ class BP_XProfile_Component extends BP_Component {
 	}
 
 	/**
-	 * Setup BuddyBar navigation
+	 * Set up navigation
 	 *
 	 * @global BuddyPress $bp The one true BuddyPress instance
 	 */
