Index: src/bp-activity/classes/class-bp-activity-component.php
===================================================================
--- src/bp-activity/classes/class-bp-activity-component.php
+++ src/bp-activity/classes/class-bp-activity-component.php
@@ -206,23 +206,13 @@
 	 * @param array $sub_nav  Optional. See BP_Component::setup_nav() for description.
 	 */
 	public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-
 		// Stop if there is no user displayed or logged in.
 		if ( ! is_user_logged_in() && ! bp_displayed_user_id() ) {
 			return;
 		}
 
-		// Determine user to use.
-		if ( bp_displayed_user_domain() ) {
-			$user_domain = bp_displayed_user_domain();
-		} elseif ( bp_loggedin_user_domain() ) {
-			$user_domain = bp_loggedin_user_domain();
-		} else {
-			return;
-		}
-
 		$slug          = bp_get_activity_slug();
-		$activity_link = trailingslashit( $user_domain . $slug );
+		$activity_link = trailingslashit( bp_displayed_user_domain() . $slug );
 
 		// Add 'Activity' to the main navigation.
 		$main_nav = array(
Index: src/bp-blogs/classes/class-bp-blogs-component.php
===================================================================
--- src/bp-blogs/classes/class-bp-blogs-component.php
+++ src/bp-blogs/classes/class-bp-blogs-component.php
@@ -203,17 +203,13 @@
 			return false;
 		}
 
-		// Determine user to use.
-		if ( bp_displayed_user_domain() ) {
-			$user_domain = bp_displayed_user_domain();
-		} elseif ( bp_loggedin_user_domain() ) {
-			$user_domain = bp_loggedin_user_domain();
-		} else {
+		// Bail if not on a user page.
+		if ( ! bp_is_user()  ) {
 			return;
 		}
 
 		$slug       = bp_get_blogs_slug();
-		$parent_url = trailingslashit( $user_domain . $slug );
+		$parent_url = trailingslashit( bp_displayed_user_domain() . $slug );
 
 		// Add 'Sites' to the main navigation.
 		$count    = (int) bp_get_total_blog_count_for_user();
Index: src/bp-core/bp-core-adminbar.php
===================================================================
--- src/bp-core/bp-core-adminbar.php
+++ src/bp-core/bp-core-adminbar.php
@@ -55,28 +55,10 @@
 		show_admin_bar( true );
 	}
 
-	// Hide the WordPress Toolbar and show the BuddyBar.
+	// Hide the WordPress Toolbar.
 	if ( ! bp_use_wp_admin_bar() ) {
-		_doing_it_wrong( __FUNCTION__, __( 'The BuddyBar is no longer supported. Please migrate to the WordPress toolbar as soon as possible.', 'buddypress' ), '2.1.0' );
-
-		// Load deprecated code if not available.
-		if ( ! function_exists( 'bp_core_admin_bar' ) ) {
-			require buddypress()->plugin_dir . 'bp-core/deprecated/2.1.php';
-		}
-
 		// 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 );
Index: src/bp-core/css/buddybar-rtl.css
deleted file mode 100644
===================================================================
--- src/bp-core/css/buddybar-rtl.css
+++ /dev/null
@@ -1,237 +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: 1;
-	text-align: right;
-}
-
-#wp-admin-bar li a {
-	padding: 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: 700;
-	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) 88% 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-topright: 0;
-	-webkit-border-top-right-radius: 0;
-	-moz-border-radius-topleft: 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;
-}
Index: src/bp-core/css/buddybar.css
deleted file mode 100644
===================================================================
--- src/bp-core/css/buddybar.css
+++ /dev/null
@@ -1,237 +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: 1;
-	text-align: left;
-}
-
-#wp-admin-bar li a {
-	padding: 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: 700;
-	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;
-}
Index: src/bp-core/deprecated/2.1.php
===================================================================
--- src/bp-core/deprecated/2.1.php
+++ src/bp-core/deprecated/2.1.php
@@ -39,61 +39,6 @@
  * @return false|null Returns false on failure. Otherwise echoes the menu item.
  */
 function bp_adminbar_blogs_menu() {
-
-	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="' . trailingslashit( bp_get_blogs_directory_permalink() . 'create' ) . '">' . __( 'Create a Site!', 'buddypress' ) . '</a>';
-			echo '</li>';
-		}
-
-		echo '</ul>';
-		echo '</li>';
-	}
 }
 
 /**
@@ -135,32 +80,6 @@
  * @deprecated 2.1.0
  */
 function bp_core_admin_bar() {
-	$bp = buddypress();
-
-	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;
 }
 
 /**
@@ -169,7 +88,6 @@
  * @deprecated 2.1.0
  */
 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>';
 }
 
 /**
@@ -182,17 +100,6 @@
  * @return false|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>';
-	}
 }
 
 /**
@@ -203,79 +110,9 @@
  * @return false|null Returns false on failure.
  */
 function bp_adminbar_account_menu() {
-	$bp = buddypress();
-
-	if ( empty( $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>';
-	}
 }
 
 /**
@@ -286,31 +123,6 @@
  * @deprecated 2.1.0
  */
 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 bp_members_directory_permalink(); ?>?random-member" rel="nofollow"><?php _e( 'Random Member', 'buddypress' ) ?></a></li>
-
-			<?php if ( bp_is_active( 'groups' ) ) : ?>
-
-				<li class="alt"><a href="<?php bp_groups_directory_permalink(); ?>?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 bp_blogs_directory_permalink(); ?>?random-blog"  rel="nofollow"><?php _e( 'Random Site', 'buddypress' ) ?></a></li>
-
-			<?php endif; ?>
-
-			<?php do_action( 'bp_adminbar_random_menu' ) ?>
-
-		</ul>
-	</li>
-
-	<?php
 }
 
 /**
@@ -319,27 +131,7 @@
  * @deprecated 2.1.0
  */
 function bp_core_load_buddybar_css() {
-
-	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 = bp_core_get_minified_asset_suffix();
-
-	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_style_add_data( 'bp-admin-bar', 'rtl', true );
-	if ( $min ) {
-		wp_style_add_data( 'bp-admin-bar', 'suffix', $min );
-	}
 }
-add_action( 'bp_init', 'bp_core_load_buddybar_css' );
 
 /**
  * Add menu items to the BuddyBar.
@@ -349,55 +141,7 @@
  * @deprecated 2.1.0
  */
 function bp_groups_adminbar_admin_menu() {
-	$bp = buddypress();
-
-	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' ) && $bp->avatar->show_avatars ) : ?>
-
-				<li><a href="<?php bp_groups_action_link( 'admin/group-avatar' ); ?>"><?php _e( 'Group Profile Photo', '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 );
 
 /**
  * Add the Notifications menu to the BuddyBar.
@@ -405,15 +149,7 @@
  * @deprecated 2.1.0
  */
 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).
@@ -421,52 +157,7 @@
  * @deprecated 2.1.0
  */
 function bp_adminbar_authors_menu() {
-	global $wpdb;
-
-	// Only for multisite
-	if ( ! is_multisite() ) {
-		return false;
-	}
-
-	// Hide on root blog
-	if ( bp_is_root_blog( $wpdb->blogid ) || ! 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.
@@ -477,42 +168,7 @@
  * @deprecated 2.1.0
  */
 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 Profile Photo", '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 );
 
 /**
  * Create the Notifications menu for the BuddyBar.
@@ -521,45 +177,7 @@
  * @deprecated 2.1.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' );
-
-	$notification_count = bp_notifications_get_unread_notification_count( bp_loggedin_user_id() );
-	$notifications      = bp_notifications_get_notifications_for_user( bp_loggedin_user_id() );
-
-	if ( ! empty( $notification_count ) ) : ?>
-		<span><?php echo bp_core_number_format( $notification_count ); ?></span>
-	<?php
-	endif;
-
-	echo '</a>';
-	echo '<ul>';
-
-	if ( ! empty( $notifications ) ) {
-		$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 );
 
 /**
  * Output the base URL for subdomain installations of WordPress Multisite.
Index: src/bp-friends/classes/class-bp-friends-component.php
===================================================================
--- src/bp-friends/classes/class-bp-friends-component.php
+++ src/bp-friends/classes/class-bp-friends-component.php
@@ -157,19 +157,14 @@
 	 *                        description.
 	 */
 	public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-
-		// Determine user to use.
-		if ( bp_displayed_user_domain() ) {
-			$user_domain = bp_displayed_user_domain();
-		} elseif ( bp_loggedin_user_domain() ) {
-			$user_domain = bp_loggedin_user_domain();
-		} else {
+		// Bail if not on a user page.
+		if ( ! bp_is_user()  ) {
 			return;
 		}
 
 		$access       = bp_core_can_edit_settings();
 		$slug         = bp_get_friends_slug();
-		$friends_link = trailingslashit( $user_domain . $slug );
+		$friends_link = trailingslashit( bp_displayed_user_domain() . $slug );
 
 		// Add 'Friends' to the main navigation.
 		$count = friends_get_total_friend_count();
Index: src/bp-groups/classes/class-bp-groups-component.php
===================================================================
--- src/bp-groups/classes/class-bp-groups-component.php
+++ src/bp-groups/classes/class-bp-groups-component.php
@@ -517,16 +517,6 @@
 	 * @param array $sub_nav  Optional. See BP_Component::setup_nav() for description.
 	 */
 	public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-
-		// Determine user to use.
-		if ( bp_displayed_user_domain() ) {
-			$user_domain = bp_displayed_user_domain();
-		} elseif ( bp_loggedin_user_domain() ) {
-			$user_domain = bp_loggedin_user_domain();
-		} else {
-			$user_domain = false;
-		}
-
 		// Only grab count if we're on a user page.
 		if ( bp_is_user() ) {
 			$class = ( 0 === groups_total_groups_for_user( bp_displayed_user_id() ) ) ? 'no-count' : 'count';
@@ -556,9 +546,10 @@
 			'item_css_id'         => $this->id
 		);
 
-		if ( ! empty( $user_domain ) ) {
+		// User profile nav.
+		if ( bp_is_user() ) {
 			$access      = bp_core_can_edit_settings();
-			$groups_link = trailingslashit( $user_domain . $slug );
+			$groups_link = trailingslashit( bp_displayed_user_domain() . $slug );
 
 			// Add the My Groups nav item.
 			$sub_nav[] = array(
@@ -585,6 +576,7 @@
 			parent::setup_nav( $main_nav, $sub_nav );
 		}
 
+		// Single group nav.
 		if ( bp_is_groups_component() && bp_is_single_item() ) {
 
 			// Reset sub nav.
Index: src/bp-members/classes/class-bp-members-component.php
===================================================================
--- src/bp-members/classes/class-bp-members-component.php
+++ src/bp-members/classes/class-bp-members-component.php
@@ -305,15 +305,6 @@
 			return;
 		}
 
-		// Determine user to use.
-		if ( bp_displayed_user_domain() ) {
-			$user_domain = bp_displayed_user_domain();
-		} elseif ( bp_loggedin_user_domain() ) {
-			$user_domain = bp_loggedin_user_domain();
-		} else {
-			return;
-		}
-
 		// Set slug to profile in case the xProfile component is not active
 		$slug = bp_get_profile_slug();
 
@@ -341,7 +332,7 @@
 		$this->sub_nav = array(
 			'name'            => _x( 'View', 'Member profile view', 'buddypress' ),
 			'slug'            => 'public',
-			'parent_url'      => trailingslashit( $user_domain . $slug ),
+			'parent_url'      => trailingslashit( bp_displayed_user_domain() . $slug ),
 			'parent_slug'     => $slug,
 			'screen_function' => 'bp_members_screen_display_profile',
 			'position'        => 10
@@ -365,7 +356,7 @@
 			$front_subnav['parent_slug'] = 'front';
 
 			// In case the subnav is displayed in the front template
-			$front_subnav['parent_url'] = trailingslashit( $user_domain . 'front' );
+			$front_subnav['parent_url'] = trailingslashit( bp_displayed_user_domain() . 'front' );
 
 			// Set the subnav
 			$sub_nav[] = $front_subnav;
Index: src/bp-messages/classes/class-bp-messages-component.php
===================================================================
--- src/bp-messages/classes/class-bp-messages-component.php
+++ src/bp-messages/classes/class-bp-messages-component.php
@@ -197,19 +197,14 @@
 	 * @param array $sub_nav  See {BP_Component::setup_nav()} for details.
 	 */
 	public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-
-		// Determine user to use.
-		if ( bp_displayed_user_domain() ) {
-			$user_domain = bp_displayed_user_domain();
-		} elseif ( bp_loggedin_user_domain() ) {
-			$user_domain = bp_loggedin_user_domain();
-		} else {
+		// Bail if not on a user page.
+		if ( ! bp_is_user()  ) {
 			return;
 		}
 
 		$access        = bp_core_can_edit_settings();
 		$slug          = bp_get_messages_slug();
-		$messages_link = trailingslashit( $user_domain . $slug );
+		$messages_link = trailingslashit( bp_displayed_user_domain() . $slug );
 
 		// Only grab count if we're on a user page and current user has access.
 		if ( bp_is_user() && bp_user_has_access() ) {
Index: src/bp-notifications/classes/class-bp-notifications-component.php
===================================================================
--- src/bp-notifications/classes/class-bp-notifications-component.php
+++ src/bp-notifications/classes/class-bp-notifications-component.php
@@ -139,19 +139,14 @@
 	 *                        description.
 	 */
 	public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-
-		// Determine user to use.
-		if ( bp_displayed_user_domain() ) {
-			$user_domain = bp_displayed_user_domain();
-		} elseif ( bp_loggedin_user_domain() ) {
-			$user_domain = bp_loggedin_user_domain();
-		} else {
+		// Bail if not on a user page.
+		if ( ! bp_is_user()  ) {
 			return;
 		}
 
 		$access             = bp_core_can_edit_settings();
 		$slug               = bp_get_notifications_slug();
-		$notifications_link = trailingslashit( $user_domain . $slug );
+		$notifications_link = trailingslashit( bp_displayed_user_domain() . $slug );
 
 		// Only grab count if we're on a user page and current user has access.
 		if ( bp_is_user() && bp_user_has_access() ) {
Index: src/bp-settings/classes/class-bp-settings-component.php
===================================================================
--- src/bp-settings/classes/class-bp-settings-component.php
+++ src/bp-settings/classes/class-bp-settings-component.php
@@ -122,19 +122,14 @@
 	 * @param array $sub_nav  Array of sub nav items.
 	 */
 	public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-
-		// Determine user to use.
-		if ( bp_displayed_user_domain() ) {
-			$user_domain = bp_displayed_user_domain();
-		} elseif ( bp_loggedin_user_domain() ) {
-			$user_domain = bp_loggedin_user_domain();
-		} else {
+		// Bail if not on a user page.
+		if ( ! bp_is_user()  ) {
 			return;
 		}
 
 		$access        = bp_core_can_edit_settings();
 		$slug          = bp_get_settings_slug();
-		$settings_link = trailingslashit( $user_domain . $slug );
+		$settings_link = trailingslashit( bp_displayed_user_domain() . $slug );
 
 		// Add the settings navigation item.
 		$main_nav = array(
Index: src/bp-xprofile/classes/class-bp-xprofile-component.php
===================================================================
--- src/bp-xprofile/classes/class-bp-xprofile-component.php
+++ src/bp-xprofile/classes/class-bp-xprofile-component.php
@@ -233,19 +233,14 @@
 	 * @param array $sub_nav  Array of sub nav items to set up.
 	 */
 	public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-
-		// Determine user to use.
-		if ( bp_displayed_user_domain() ) {
-			$user_domain = bp_displayed_user_domain();
-		} elseif ( bp_loggedin_user_domain() ) {
-			$user_domain = bp_loggedin_user_domain();
-		} else {
+		// Bail if not on a user page.
+		if ( ! bp_is_user()  ) {
 			return;
 		}
 
 		$access       = bp_core_can_edit_settings();
 		$slug         = bp_get_profile_slug();
-		$profile_link = trailingslashit( $user_domain . $slug );
+		$profile_link = trailingslashit( bp_displayed_user_domain() . $slug );
 
 		// Add 'Profile' to the main navigation.
 		$main_nav = array(
@@ -320,27 +315,15 @@
 	 * @since 2.1.0
 	 */
 	public function setup_settings_nav() {
-		if ( ! bp_is_active( 'settings' ) ) {
-			return;
-		}
-
-		// Determine user to use.
-		if ( bp_displayed_user_domain() ) {
-			$user_domain = bp_displayed_user_domain();
-		} elseif ( bp_loggedin_user_domain() ) {
-			$user_domain = bp_loggedin_user_domain();
-		} else {
+		if ( ! bp_is_active( 'settings' ) || ! bp_is_user() ) {
 			return;
 		}
 
-		// Get the settings slug.
-		$settings_slug = bp_get_settings_slug();
-
 		bp_core_new_subnav_item( array(
 			'name'            => _x( 'Profile Visibility', 'Profile settings sub nav', 'buddypress' ),
 			'slug'            => 'profile',
-			'parent_url'      => trailingslashit( $user_domain . $settings_slug ),
-			'parent_slug'     => $settings_slug,
+			'parent_url'      => trailingslashit( bp_displayed_user_domain() . bp_get_settings_slug() ),
+			'parent_slug'     => bp_get_settings_slug(),
 			'screen_function' => 'bp_xprofile_screen_settings',
 			'position'        => 30,
 			'user_has_access' => bp_core_can_edit_settings()