Disabling global cart still configures the global store on the main blog.

I have MarketPress activated networked wide,
And I marked "Enable Global shopping cart" as NO,

Then I tested http://www.main_site_domain.com/marketplace and the global shop is there.

I guess all the global actions on filters could be voided if global is disabled.

Someting like this ?

marketplace-ms.php ( in the constructor)

$settings = get_site_option( 'mp_network_settings' );
    if  ($settings['global_cart'] )  {

                //Templates and Rewrites
                if ( $this->is_main_site() )  {
                            add_action( 'template_redirect', array(&$this, 'load_marketplace_templates') );
                            add_filter( 'rewrite_rules_array', array(&$this, 'add_rewrite_rules') );
                            add_filter( 'query_vars', array(&$this, 'add_queryvars') );
                }

                //check for main blog limits
                  if ( ( $settings['main_blog'] && $this->is_main_site() ) || !$settings['main_blog'] ) {
                  //shortcodes
                  add_shortcode( 'mp_list_global_products', array(&$this, 'mp_list_global_products_sc') );
                  add_shortcode( 'mp_global_categories_list', array(&$this, 'mp_global_categories_list_sc') );
                  add_shortcode( 'mp_global_tag_cloud', array(&$this, 'mp_global_tag_cloud_sc') );

                  //widgets
                  add_action( 'widgets_init', create_function('', 'return register_widget("MarketPress_Global_Product_List");') );
                  add_action( 'widgets_init', create_function('', 'return register_widget("MarketPress_Global_Tag_Cloud_Widget");') );
                  add_action( 'widgets_init', create_function('', 'return register_widget("MarketPress_Global_Category_List_Widget");') );
                }
    }