Index: bp-activity/bp-activity-admin.php
===================================================================
--- bp-activity/bp-activity-admin.php	(revision 5948)
+++ bp-activity/bp-activity-admin.php	(working copy)
@@ -393,8 +393,8 @@
 					 * Remove moderation and blacklist checks in case we want to ham an activity
 					 * which contains one of these listed keys.
 					 */
-					remove_action( 'bp_activity_before_save', 'bp_activity_check_moderation_keys', 2, 1 );
-					remove_action( 'bp_activity_before_save', 'bp_activity_check_blacklist_keys',  2, 1 );
+					remove_action( 'bp_activity_before_save', 'bp_activity_check_moderation_keys', 2);
+					remove_action( 'bp_activity_before_save', 'bp_activity_check_blacklist_keys',  2);
 
 					bp_activity_mark_as_ham( $activity );
 					$result = $activity->save();
Index: bp-activity/bp-activity-filters.php
===================================================================
--- bp-activity/bp-activity-filters.php	(revision 5948)
+++ bp-activity/bp-activity-filters.php	(working copy)
@@ -603,7 +603,7 @@
 	ob_end_clean();
 
 	// Remove the temporary filter.
-	remove_filter( 'bp_get_activity_css_class', 'bp_activity_newest_class', 10, 1 );
+	remove_filter( 'bp_get_activity_css_class', 'bp_activity_newest_class', 10);
 
 	if ( ! empty( $newest_activities['last_recorded'] ) ) {
 		$response['bp_activity_newest_activities'] = $newest_activities;
Index: bp-activity/bp-activity-functions.php
===================================================================
--- bp-activity/bp-activity-functions.php	(revision 5948)
+++ bp-activity/bp-activity-functions.php	(working copy)
@@ -1445,7 +1445,7 @@
 	$action = apply_filters( 'bp_activity_generate_action_string', $activity->action, $activity );
 
 	// Remove the filter for future activity items.
-	remove_filter( 'bp_activity_generate_action_string', $actions->{$activity->component}->{$activity->type}['format_callback'], 10, 2 );
+	remove_filter( 'bp_activity_generate_action_string', $actions->{$activity->component}->{$activity->type}['format_callback'], 10);
 
 	return $action;
 }
@@ -3321,7 +3321,7 @@
 
 	// If Akismet is active, and this was a manual spam/ham request, stop Akismet checking the activity.
 	if ( 'by_a_person' == $source && !empty( $bp->activity->akismet ) ) {
-		remove_action( 'bp_activity_before_save', array( $bp->activity->akismet, 'check_activity' ), 4, 1 );
+		remove_action( 'bp_activity_before_save', array( $bp->activity->akismet, 'check_activity' ), 4);
 
 		// Build data package for Akismet.
 		$activity_data = BP_Akismet::build_akismet_data_package( $activity );
@@ -3368,7 +3368,7 @@
 
 	// If Akismet is active, and this was a manual spam/ham request, stop Akismet checking the activity.
 	if ( 'by_a_person' == $source && !empty( $bp->activity->akismet ) ) {
-		remove_action( 'bp_activity_before_save', array( $bp->activity->akismet, 'check_activity' ), 4, 1 );
+		remove_action( 'bp_activity_before_save', array( $bp->activity->akismet, 'check_activity' ), 4);
 
 		// Build data package for Akismet.
 		$activity_data = BP_Akismet::build_akismet_data_package( $activity );
Index: bp-blogs/bp-blogs-activity.php
===================================================================
--- bp-blogs/bp-blogs-activity.php	(revision 5948)
+++ bp-blogs/bp-blogs-activity.php	(working copy)
@@ -961,8 +961,8 @@
 	$old_comment_status  = $post_comment_status;
 
 	// No need to edit the activity, as it's the activity who's updating the comment
-	remove_action( 'transition_comment_status',     'bp_activity_transition_post_type_comment_status', 10, 3 );
-	remove_action( 'bp_activity_post_type_comment', 'bp_blogs_comment_sync_activity_comment',          10, 4 );
+	remove_action( 'transition_comment_status',     'bp_activity_transition_post_type_comment_status', 10);
+	remove_action( 'bp_activity_post_type_comment', 'bp_blogs_comment_sync_activity_comment',          10);
 
 	if ( 1 === $activity->is_spam && 'spam' !== $post_comment_status ) {
 		wp_spam_comment( $post_comment_id );
Index: bp-core/admin/bp-core-admin-functions.php
===================================================================
--- bp-core/admin/bp-core-admin-functions.php	(revision 5948)
+++ bp-core/admin/bp-core-admin-functions.php	(working copy)
@@ -1141,7 +1141,7 @@
 
 	$loader = basename( constant( 'BP_PLUGIN_DIR' ) ) . '/bp-loader.php';
 
-	remove_action( "after_plugin_row_{$loader}", 'wp_plugin_update_row', 10, 2 );
+	remove_action( "after_plugin_row_{$loader}", 'wp_plugin_update_row', 10);
 	add_action( "after_plugin_row_{$loader}", 'bp_core_admin_php52_plugin_row', 10, 2 );
 }
 add_action( 'load-plugins.php', 'bp_core_admin_maybe_disable_update_row_for_php53_requirement', 100 );
Index: bp-core/bp-core-functions.php
===================================================================
--- bp-core/bp-core-functions.php	(revision 5948)
+++ bp-core/bp-core-functions.php	(working copy)
@@ -2372,7 +2372,7 @@
 		return;
 	}
 
-	remove_action( 'wp_head', 'adjacent_posts_rel_link_wp_head', 10, 0 );
+	remove_action( 'wp_head', 'adjacent_posts_rel_link_wp_head', 10);
 }
 add_action( 'bp_init', 'bp_remove_adjacent_posts_rel_link' );
 
Index: bp-core/classes/class-bp-attachment.php
===================================================================
--- bp-core/classes/class-bp-attachment.php	(revision 5948)
+++ bp-core/classes/class-bp-attachment.php	(working copy)
@@ -277,7 +277,7 @@
 		}
 
 		// Remove the pre WordPress 4.0 static filter.
-		remove_filter( 'wp_handle_upload_prefilter', array( $this, 'validate_upload' ), 10, 1 );
+		remove_filter( 'wp_handle_upload_prefilter', array( $this, 'validate_upload' ), 10);
 
 		// Finally return the uploaded file or the error.
 		return $this->attachment;
Index: bp-core/deprecated/2.5.php
===================================================================
--- bp-core/deprecated/2.5.php	(revision 5948)
+++ bp-core/deprecated/2.5.php	(working copy)
@@ -701,7 +701,7 @@
 		'settings-verify-email-change',
 	);
 
-	remove_action( 'bp_send_email_success', 'bp_core_deprecated_email_actions', 20, 2 );
+	remove_action( 'bp_send_email_success', 'bp_core_deprecated_email_actions', 20);
 	$email_content = $email->get( 'content' );
 	$email_subject = $email->get( 'subject' );
 	$email_type    = $email->get( 'type' );
Index: bp-forums/bbpress/bb-includes/backpress/functions.plugin-api.php
===================================================================
--- bp-forums/bbpress/bb-includes/backpress/functions.plugin-api.php	(revision 5948)
+++ bp-forums/bbpress/bb-includes/backpress/functions.plugin-api.php	(working copy)
@@ -249,7 +249,7 @@
  * @param int $accepted_args optional. The number of arguments the function accpets (default: 1).
  * @return boolean Whether the function existed before it was removed.
  */
-function remove_filter($tag, $function_to_remove, $priority = 10, $accepted_args = 1) {
+function remove_filter($tag, $function_to_remove, $priority = 10) {
 	$function_to_remove = _wp_filter_build_unique_id($tag, $function_to_remove, $priority);
 
 	$r = isset($GLOBALS['wp_filter'][$tag][$priority][$function_to_remove]);
@@ -512,8 +512,8 @@
  * @param int $accepted_args optional. The number of arguments the function accpets (default: 1).
  * @return boolean Whether the function is removed.
  */
-function remove_action($tag, $function_to_remove, $priority = 10, $accepted_args = 1) {
-	return remove_filter($tag, $function_to_remove, $priority, $accepted_args);
+function remove_action($tag, $function_to_remove, $priority = 10) {
+	return remove_filter($tag, $function_to_remove, $priority);
 }
 
 /**
Index: bp-groups/bp-groups-template.php
===================================================================
--- bp-groups/bp-groups-template.php	(revision 5948)
+++ bp-groups/bp-groups-template.php	(working copy)
@@ -2830,7 +2830,7 @@
 
 	bp_get_options_nav( $group->slug . '_manage' );
 
-	remove_filter( "bp_get_options_nav_{$css_id}", 'bp_group_admin_tabs_backcompat', 10, 3 );
+	remove_filter( "bp_get_options_nav_{$css_id}", 'bp_group_admin_tabs_backcompat', 10);
 }
 
 /**
Index: bp-groups/classes/class-bp-group-member-query.php
===================================================================
--- bp-groups/classes/class-bp-group-member-query.php	(revision 5948)
+++ bp-groups/classes/class-bp-group-member-query.php	(working copy)
@@ -330,7 +330,7 @@
 		}
 
 		// Don't filter other BP_User_Query objects on the same page.
-		remove_action( 'bp_user_query_populate_extras', array( $this, 'populate_group_member_extras' ), 10, 2 );
+		remove_action( 'bp_user_query_populate_extras', array( $this, 'populate_group_member_extras' ), 10);
 	}
 
 	/**
Index: bp-groups/classes/class-bp-groups-list-table.php
===================================================================
--- bp-groups/classes/class-bp-groups-list-table.php	(revision 5948)
+++ bp-groups/classes/class-bp-groups-list-table.php	(working copy)
@@ -722,7 +722,7 @@
 			'label'          => '',
 			'show_all'       => true
 		) );
-		remove_filter( 'bp_get_group_type_directory_permalink', array( $this, 'group_type_permalink_use_admin_filter' ), 10, 2 );
+		remove_filter( 'bp_get_group_type_directory_permalink', array( $this, 'group_type_permalink_use_admin_filter' ), 10);
 
 		/**
 		 * Filters the markup for the Group Type column.
Index: bp-members/bp-members-functions.php
===================================================================
--- bp-members/bp-members-functions.php	(revision 5948)
+++ bp-members/bp-members-functions.php	(working copy)
@@ -1162,8 +1162,8 @@
 	// As of BuddyPress 2.0, last_activity is no longer stored in usermeta.
 	// However, we mirror it there for backward compatibility. Do not use!
 	// Remove our warning and re-add.
-	remove_filter( 'update_user_metadata', '_bp_update_user_meta_last_activity_warning', 10, 4 );
-	remove_filter( 'get_user_metadata', '_bp_get_user_meta_last_activity_warning', 10, 3 );
+	remove_filter( 'update_user_metadata', '_bp_update_user_meta_last_activity_warning', 10);
+	remove_filter( 'get_user_metadata', '_bp_get_user_meta_last_activity_warning', 10);
 	bp_update_user_meta( $user_id, 'last_activity', $time );
 	add_filter( 'update_user_metadata', '_bp_update_user_meta_last_activity_warning', 10, 4 );
 	add_filter( 'get_user_metadata', '_bp_get_user_meta_last_activity_warning', 10, 3 );
Index: bp-members/classes/class-bp-members-admin.php
===================================================================
--- bp-members/classes/class-bp-members-admin.php	(revision 5948)
+++ bp-members/classes/class-bp-members-admin.php	(working copy)
@@ -1306,7 +1306,7 @@
 	 * @since 2.1.0
 	 */
 	public function remove_edit_profile_url_filter() {
-		remove_filter( 'bp_members_edit_profile_url', array( $this, 'filter_adminbar_profile_link' ), 10, 3 );
+		remove_filter( 'bp_members_edit_profile_url', array( $this, 'filter_adminbar_profile_link' ), 10);
 	}
 
 	/** Signups Management ****************************************************/
Index: bp-templates/bp-legacy/buddypress-functions.php
===================================================================
--- bp-templates/bp-legacy/buddypress-functions.php	(revision 5948)
+++ bp-templates/bp-legacy/buddypress-functions.php	(working copy)
@@ -969,7 +969,7 @@
 	}
 
 	if ( ! empty( $last_recorded ) ) {
-		remove_filter( 'bp_get_activity_css_class', 'bp_activity_newest_class', 10, 1 );
+		remove_filter( 'bp_get_activity_css_class', 'bp_activity_newest_class', 10);
 	}
 
 	exit;
Index: bp-xprofile/bp-xprofile-filters.php
===================================================================
--- bp-xprofile/bp-xprofile-filters.php	(revision 5948)
+++ bp-xprofile/bp-xprofile-filters.php	(working copy)
@@ -328,7 +328,7 @@
  * - URL's are made clickable.
  *
  * To disable globally:
- *     remove_filter( 'bp_get_the_profile_field_value', 'xprofile_filter_link_profile_data', 9, 3 );
+ *     remove_filter( 'bp_get_the_profile_field_value', 'xprofile_filter_link_profile_data', 9);
  *
  * To disable for a single field, use the 'Autolink' settings in Dashboard > Users > Profile Fields.
  *