Index: bp-themes/bp-default/registration/activate.php
===================================================================
--- bp-themes/bp-default/registration/activate.php	(revision 3429)
+++ bp-themes/bp-default/registration/activate.php	(working copy)
@@ -1,5 +1,3 @@
-<?php /* This template is only used on multisite installations */ ?>
-
 <?php get_header(); ?>
 
 	<div id="content">
@@ -9,8 +7,6 @@
 
 		<div class="page" id="activate-page">
 
-			<?php do_action( 'template_notices' ) ?>
-
 			<?php if ( bp_account_was_activated() ) : ?>
 
 				<h2 class="widgettitle"><?php _e( 'Account Activated', 'buddypress' ) ?></h2>
Index: bp-themes/bp-default/registration/register.php
===================================================================
--- bp-themes/bp-default/registration/register.php	(revision 3429)
+++ bp-themes/bp-default/registration/register.php	(working copy)
@@ -228,57 +228,6 @@
 					<p><?php _e( 'You have successfully created your account! Please log in using the username and password you have just created.', 'buddypress' ) ?></p>
 				<?php endif; ?>
 
-				<?php if ( bp_is_active( 'xprofile' ) && !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
-
-					<?php if ( 'upload-image' == bp_get_avatar_admin_step() ) : ?>
-
-						<h4><?php _e( 'Your Current Avatar', 'buddypress' ) ?></h4>
-						<p><?php _e( "We've fetched an avatar for your new account. If you'd like to change this, why not upload a new one?", 'buddypress' ) ?></p>
-
-						<div id="signup-avatar">
-							<?php bp_signup_avatar() ?>
-						</div>
-
-						<p>
-							<input type="file" name="file" id="file" />
-							<input type="submit" name="upload" id="upload" value="<?php _e( 'Upload Image', 'buddypress' ) ?>" />
-							<input type="hidden" name="action" id="action" value="bp_avatar_upload" />
-							<input type="hidden" name="signup_email" id="signup_email" value="<?php bp_signup_email_value() ?>" />
-							<input type="hidden" name="signup_username" id="signup_username" value="<?php bp_signup_username_value() ?>" />
-						</p>
-
-						<?php wp_nonce_field( 'bp_avatar_upload' ) ?>
-
-					<?php endif; ?>
-
-					<?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
-
-						<h3><?php _e( 'Crop Your New Avatar', 'buddypress' ) ?></h3>
-
-						<img src="<?php bp_avatar_to_crop() ?>" id="avatar-to-crop" class="avatar" alt="<?php _e( 'Avatar to crop', 'buddypress' ) ?>" />
-
-						<div id="avatar-crop-pane">
-							<img src="<?php bp_avatar_to_crop() ?>" id="avatar-crop-preview" class="avatar" alt="<?php _e( 'Avatar preview', 'buddypress' ) ?>" />
-						</div>
-
-						<input type="submit" name="avatar-crop-submit" id="avatar-crop-submit" value="<?php _e( 'Crop Image', 'buddypress' ) ?>" />
-
-						<input type="hidden" name="signup_email" id="signup_email" value="<?php bp_signup_email_value() ?>" />
-						<input type="hidden" name="signup_username" id="signup_username" value="<?php bp_signup_username_value() ?>" />
-						<input type="hidden" name="signup_avatar_dir" id="signup_avatar_dir" value="<?php bp_signup_avatar_dir_value() ?>" />
-
-						<input type="hidden" name="image_src" id="image_src" value="<?php bp_avatar_to_crop_src() ?>" />
-						<input type="hidden" id="x" name="x" />
-						<input type="hidden" id="y" name="y" />
-						<input type="hidden" id="w" name="w" />
-						<input type="hidden" id="h" name="h" />
-
-						<?php wp_nonce_field( 'bp_avatar_cropstore' ) ?>
-
-					<?php endif; ?>
-
-				<?php endif; ?>
-
 			<?php endif; // completed-confirmation signup step ?>
 
 			<?php do_action( 'bp_custom_signup_steps' ) ?>
Index: bp-core/bp-core-signup.php
===================================================================
--- bp-core/bp-core-signup.php	(revision 3429)
+++ bp-core/bp-core-signup.php	(working copy)
@@ -154,53 +154,6 @@
 
 	}
 
-	$bp->avatar_admin->step = 'upload-image';
-
-	/* If user has uploaded a new avatar */
-	if ( !empty( $_FILES ) ) {
-
-		/* Check the nonce */
-		check_admin_referer( 'bp_avatar_upload' );
-
-		$bp->signup->step = 'completed-confirmation';
-
-		if ( is_multisite() ) {
-			/* Get the activation key */
-			if ( !$bp->signup->key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $_POST[ 'signup_username' ], $_POST[ 'signup_email' ] ) ) ) {
-				bp_core_add_message( __( 'There was a problem uploading your avatar, please try uploading it again', 'buddypress' ) );
-			} else {
-				/* Hash the key to create the upload folder (added security so people don't sniff the activation key) */
-				$bp->signup->avatar_dir = wp_hash( $bp->signup->key );
-			}
-		} else {
-			$user_id = bp_core_get_userid( $_POST['signup_username'] );
-			$bp->signup->avatar_dir = wp_hash( $user_id );
-		}
-
-		/* Pass the file to the avatar upload handler */
-		if ( bp_core_avatar_handle_upload( $_FILES, 'bp_core_signup_avatar_upload_dir' ) ) {
-			$bp->avatar_admin->step = 'crop-image';
-
-			/* Make sure we include the jQuery jCrop file for image cropping */
-			add_action( 'wp_print_scripts', 'bp_core_add_jquery_cropper' );
-		}
-	}
-
-	/* If the image cropping is done, crop the image and save a full/thumb version */
-	if ( isset( $_POST['avatar-crop-submit'] ) ) {
-
-		/* Check the nonce */
-		check_admin_referer( 'bp_avatar_cropstore' );
-
-		/* Reset the avatar step so we can show the upload form again if needed */
-		$bp->signup->step = 'completed-confirmation';
-		$bp->avatar_admin->step = 'upload-image';
-
-		if ( !bp_core_avatar_handle_crop( array( 'original_file' => $_POST['image_src'], 'crop_x' => $_POST['x'], 'crop_y' => $_POST['y'], 'crop_w' => $_POST['w'], 'crop_h' => $_POST['h'] ) ) )
-			bp_core_add_message( __( 'There was a problem cropping your avatar, please try uploading it again', 'buddypress' ), 'error' );
-		else
-			bp_core_add_message( __( 'Your new avatar was uploaded successfully', 'buddypress' ) );
-	}
 	bp_core_load_template( apply_filters( 'bp_core_template_register', 'registration/register' ) );
 }
 add_action( 'wp', 'bp_core_screen_signup', 3 );