Index: bp-core/bp-core-widgets.php
===================================================================
--- bp-core/bp-core-widgets.php	(revision 5892)
+++ bp-core/bp-core-widgets.php	(working copy)
@@ -14,10 +14,6 @@

 class BP_Core_Members_Widget extends WP_Widget {

-	function bp_core_members_widget() {
-		$this->__construct();
-	}
-
 	function __construct() {
 		$widget_ops = array( 'description' => __( 'A dynamic list of recently active, popular, and newest members', 'buddypress' ) );
 		parent::__construct( false, $name = __( 'Members', 'buddypress' ), $widget_ops );
@@ -39,9 +35,9 @@
 			$instance['member_default'] = 'active';

 		echo $before_widget;
-
+
 		$title = $instance['link_title'] ? '<a href="' . trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() ) . '">' . $instance['title'] . '</a>' : $instance['title'];
-
+
 		echo $before_title
 		   . $title
 		   . $after_title; ?>
@@ -101,7 +97,7 @@

 	function update( $new_instance, $old_instance ) {
 		$instance = $old_instance;
-
+
 		$instance['title'] 	    = strip_tags( $new_instance['title'] );
 		$instance['max_members']    = strip_tags( $new_instance['max_members'] );
 		$instance['member_default'] = strip_tags( $new_instance['member_default'] );
@@ -126,7 +122,7 @@
 		?>

 		<p><label for="bp-core-widget-title"><?php _e('Title:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" style="width: 100%" /></label></p>
-
+
 		<p><label for="<?php echo $this->get_field_name('link_title') ?>"><input type="checkbox" name="<?php echo $this->get_field_name('link_title') ?>" value="1" <?php checked( $link_title ) ?> /> <?php _e( 'Link widget title to Members directory', 'buddypress' ) ?></label></p>

 		<p><label for="bp-core-widget-members-max"><?php _e('Max members to show:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_members' ); ?>" name="<?php echo $this->get_field_name( 'max_members' ); ?>" type="text" value="<?php echo esc_attr( $max_members ); ?>" style="width: 30%" /></label></p>
@@ -149,10 +145,6 @@

 class BP_Core_Whos_Online_Widget extends WP_Widget {

-	function bp_core_whos_online_widget() {
-		$this->__construct();
-	}
-
 	function __construct() {
 		$widget_ops = array( 'description' => __( 'Avatars of users who are currently online', 'buddypress' ) );
 		parent::__construct( false, $name = __( "Who's Online Avatars", 'buddypress' ), $widget_ops );
@@ -217,10 +209,6 @@

 class BP_Core_Recently_Active_Widget extends WP_Widget {

-	function bp_core_recently_active_widget() {
-		$this->__construct();
-	}
-
 	function __construct() {
 		$widget_ops = array( 'description' => __( 'Avatars of recently active members', 'buddypress' ) );
 		parent::__construct( false, $name = __( 'Recently Active Member Avatars', 'buddypress' ), $widget_ops );
Index: bp-blogs/bp-blogs-widgets.php
===================================================================
--- bp-blogs/bp-blogs-widgets.php	(revision 5892)
+++ bp-blogs/bp-blogs-widgets.php	(working copy)
@@ -21,10 +21,6 @@

 class BP_Blogs_Recent_Posts_Widget extends WP_Widget {

-	function bp_blogs_recent_posts_widget() {
-		$this->__construct();
-	}
-
 	function __construct() {
 		parent::__construct( false, $name = __( 'Recent Networkwide Posts', 'buddypress' ) );
 	}
Index: bp-blogs/bp-blogs-classes.php
===================================================================
--- bp-blogs/bp-blogs-classes.php	(revision 5892)
+++ bp-blogs/bp-blogs-classes.php	(working copy)
@@ -22,10 +22,6 @@
 	var $user_id;
 	var $blog_id;

-	function bp_blogs_blog( $id = null ) {
-		$this->__construct( $id );
-	}
-
 	function __construct( $id = null ) {
 		if ( !empty( $id ) ) {
 			$this->id = $id;
Index: bp-forums/bp-forums-bbpress-sa.php
===================================================================
--- bp-forums/bp-forums-bbpress-sa.php	(revision 5892)
+++ bp-forums/bp-forums-bbpress-sa.php	(working copy)
@@ -144,10 +144,6 @@
 	class BPDB extends WPDB {
 		var $db_servers = array();

-		function BPDB( $dbuser, $dbpassword, $dbname, $dbhost ) {
-			$this->__construct( $dbuser, $dbpassword, $dbname, $dbhost );
-		}
-
 		function __construct( $dbuser, $dbpassword, $dbname, $dbhost ) {
 			parent::__construct( $dbuser, $dbpassword, $dbname, $dbhost );

Index: bp-forums/bp-forums-template.php
===================================================================
--- bp-forums/bp-forums-template.php	(revision 5892)
+++ bp-forums/bp-forums-template.php	(working copy)
@@ -414,7 +414,7 @@
 		// When skipping the sticky logic, just pull up the forum topics like usual
 		$forum_template = new BP_Forums_Template_Forum( $type, $forum_id, $user_id, $page, $per_page, $max, 'all', $search_terms );
 	}
-
+
 	return apply_filters( 'bp_has_topics', $forum_template->has_topics(), $forum_template );
 }

@@ -479,7 +479,7 @@
 }
 	function bp_get_the_topic_poster_avatar( $args = '' ) {
 		global $forum_template;
-
+
 		$defaults = array(
 			'type'   => 'thumb',
 			'width'  => false,
@@ -574,7 +574,7 @@
 }
 	function bp_get_the_topic_object_avatar( $args = '' ) {
 		global $forum_template;
-
+
 		if ( !isset( $forum_template->topic->object_id ) )
 			return false;

@@ -992,10 +992,6 @@
 	var $sort_by;
 	var $order;

-	function BP_Forums_Template_Topic( $topic_id, $per_page, $max, $order ) {
-		$this->__construct( $topic_id, $per_page, $max, $order );
-	}
-
 	function __construct( $topic_id, $per_page, $max, $order ) {
 		global $bp, $current_user, $forum_template;

Index: bp-groups/bp-groups-template.php
===================================================================
--- bp-groups/bp-groups-template.php	(revision 5892)
+++ bp-groups/bp-groups-template.php	(working copy)
@@ -1684,10 +1684,6 @@
 	var $pag_links;
 	var $total_group_count;

-	function bp_groups_group_members_template( $group_id, $per_page, $max, $exclude_admins_mods, $exclude_banned, $exclude ) {
-		$this->__construct( $group_id, $per_page, $max, $exclude_admins_mods, $exclude_banned, $exclude );
-	}
-
 	function __construct( $group_id, $per_page, $max, $exclude_admins_mods, $exclude_banned, $exclude ) {

 		$this->pag_page = isset( $_REQUEST['mlpage'] ) ? intval( $_REQUEST['mlpage'] ) : 1;
@@ -2407,11 +2403,6 @@
 	var $pag_links;
 	var $total_request_count;

-	function bp_groups_membership_requests_template( $group_id, $per_page, $max ) {
-		$this->__construct( $group_id, $per_page, $max );
-	}
-
-
 	function __construct( $group_id, $per_page, $max ) {

 		$this->pag_page = isset( $_REQUEST['mrpage'] ) ? intval( $_REQUEST['mrpage'] ) : 1;
@@ -2578,10 +2569,6 @@
 	var $pag_links;
 	var $total_invite_count;

-	function bp_groups_invite_template( $user_id, $group_id ) {
-		$this->__construct( $user_id, $group_id );
-	}
-
 	function __construct( $user_id, $group_id ) {
 		$this->invites      = groups_get_invites_for_group( $user_id, $group_id );
 		$this->invite_count = count( $this->invites );