diff --git a/assets/stylesheets/_components.scss b/assets/stylesheets/_components.scss
index fab26d39ae3fc7..b6075ab1bf80fb 100644
--- a/assets/stylesheets/_components.scss
+++ b/assets/stylesheets/_components.scss
@@ -218,7 +218,6 @@
 @import 'my-sites/plugins/plugin-site-disabled-manage/style';
 @import 'my-sites/plugins/plugin-site-jetpack/style';
 @import 'my-sites/plugins/plugin-site-update-indicator/style';
-@import 'my-sites/plugins/plugin-site-business/style';
 @import 'my-sites/plugins/plugin-install-button/style';
 @import 'my-sites/plugins/plugin-settings-link/style';
 @import 'my-sites/plugins/plugin-remove-button/style';
diff --git a/client/lib/plugins/actions.js b/client/lib/plugins/actions.js
index 550294cb0e75c6..237b69886e509b 100644
--- a/client/lib/plugins/actions.js
+++ b/client/lib/plugins/actions.js
@@ -8,7 +8,6 @@ var debug = require( 'debug' )( 'calypso:my-sites:plugins:actions' ),
  */
 var analytics = require( 'analytics' ),
 	Dispatcher = require( 'dispatcher' ),
-	isBusiness = require( 'lib/products-values' ).isBusiness,
 	wpcom = require( 'lib/wp' ).undocumented();
 
 var _actionsQueueBySite = {},
@@ -133,7 +132,7 @@ PluginsActions = {
 	},
 
 	fetchSitePlugins: function( site ) {
-		if ( ! site.user_can_manage || ( ! site.jetpack && ! isBusiness( site.plan ) ) ) {
+		if ( ! site.user_can_manage || ! site.jetpack ) {
 			defer( () => {
 				Dispatcher.handleViewAction( {
 					type: 'NOT_ALLOWED_TO_RECEIVE_PLUGINS',
diff --git a/client/lib/plugins/store.js b/client/lib/plugins/store.js
index f9d76401b8db15..cbdc7dd1b7fa74 100644
--- a/client/lib/plugins/store.js
+++ b/client/lib/plugins/store.js
@@ -219,6 +219,11 @@ PluginsStore = {
 	// Get Plugins for a single site
 	getSitePlugins: function( site ) {
 		var storedList;
+
+		if ( ! site.jetpack ) {
+			return [];
+		}
+
 		if ( ! _pluginsBySite[ site.ID ] && ! _fetching[ site.ID ] ) {
 			storedList = getPluginsBySiteFromStorage( site.ID );
 
diff --git a/client/lib/sites-list/list.js b/client/lib/sites-list/list.js
index 4391111eb1a792..0918054259dbff 100644
--- a/client/lib/sites-list/list.js
+++ b/client/lib/sites-list/list.js
@@ -16,7 +16,6 @@ var wpcom = require( 'lib/wp' ),
 	JetpackSite = require( 'lib/site/jetpack' ),
 	Searchable = require( 'lib/mixins/searchable' ),
 	Emitter = require( 'lib/mixins/emitter' ),
-	isBusiness = require( 'lib/products-values' ).isBusiness,
 	isPlan = require( 'lib/products-values' ).isPlan,
 	PreferencesActions = require( 'lib/preferences/actions' ),
 	PreferencesStore = require( 'lib/preferences/store' ),
@@ -554,7 +553,7 @@ SitesList.prototype.getSelectedOrAllWithPlugins = function() {
 	return this.getSelectedOrAll().filter( site => {
 		return site.capabilities &&
 			site.capabilities.manage_options &&
-			( isBusiness( site.plan ) || site.jetpack ) &&
+			site.jetpack &&
 			( site.visible || this.selected )
 	} );
 };
diff --git a/client/my-sites/plugins/controller.js b/client/my-sites/plugins/controller.js
index 58d4c1bfbba49d..565be3d840bea3 100644
--- a/client/my-sites/plugins/controller.js
+++ b/client/my-sites/plugins/controller.js
@@ -30,9 +30,7 @@ var lastPluginsListVisited,
 	lastPluginsQuerystring,
 	controller;
 
-const businessPlugins = [ 'gumroad', 'shopify-store', 'ecwid' ];
-
-function renderSinglePlugin( context, siteUrl, isWpcomPlugin ) {
+function renderSinglePlugin( context, siteUrl ) {
 	var pluginSlug = decodeURIComponent( context.params.plugin ),
 		site = sites.getSelectedSite(),
 		analyticsPageTitle = 'Plugins',
@@ -43,29 +41,6 @@ function renderSinglePlugin( context, siteUrl, isWpcomPlugin ) {
 		baseAnalyticsPath += '/:site';
 	}
 
-	if ( site &&
-		site.jetpack &&
-		context.path.indexOf( '/business' ) >= 0 &&
-		businessPlugins.indexOf( pluginSlug ) >= 0
-	) {
-		return page.redirect( '/plugins/' + pluginSlug + '/' + site.slug );
-	}
-
-	if (
-		( site && ! site.jetpack ) &&
-		businessPlugins.indexOf( pluginSlug ) >= 0 &&
-		context.path.indexOf( '/business' ) < 0
-	) {
-		return page.redirect( '/plugins/' + pluginSlug + '/business' + ( site ? '/' + site.slug : '' ) );
-	}
-
-	if ( ! site &&
-		context.path.indexOf( '/business' ) >= 0 &&
-		-1 === businessPlugins.indexOf( pluginSlug )
-	) {
-		return page.redirect( '/plugins/' + pluginSlug );
-	}
-
 	analytics.pageView.record( baseAnalyticsPath, analyticsPageTitle + ' > Plugin Details' );
 
 	// Scroll to the top
@@ -80,7 +55,6 @@ function renderSinglePlugin( context, siteUrl, isWpcomPlugin ) {
 			sites: sites,
 			pluginSlug: pluginSlug,
 			siteUrl: siteUrl,
-			isWpcomPlugin: isWpcomPlugin,
 			onPluginRefresh: title => titleActions.setTitle( title )
 		} ),
 		document.getElementById( 'primary' ),
@@ -182,8 +156,7 @@ controller = {
 	},
 
 	plugin: function( context ) {
-		var isWpcomPlugin = 'business' === context.params.business_plugin,
-			siteUrl = route.getSiteFragment( context.path );
+		var siteUrl = route.getSiteFragment( context.path );
 
 		if ( siteUrl && context.params.plugin && context.params.plugin === siteUrl.toString() ) {
 			controller.plugins( 'all', context );
@@ -191,7 +164,7 @@ controller = {
 		}
 
 		notices.clearNotices( 'notices' );
-		renderSinglePlugin( context, siteUrl, isWpcomPlugin );
+		renderSinglePlugin( context, siteUrl );
 	},
 
 	browsePlugins: function( context ) {
diff --git a/client/my-sites/plugins/index.js b/client/my-sites/plugins/index.js
index 9e45a229851ca3..b846f5e6f22b6b 100644
--- a/client/my-sites/plugins/index.js
+++ b/client/my-sites/plugins/index.js
@@ -12,20 +12,20 @@ var controller = require( 'my-sites/controller' ),
 
 module.exports = function() {
 	if ( config.isEnabled( 'manage/plugins/browser' ) ) {
-		page( '/plugins/browse/:category/:site', controller.siteSelection, controller.navigation, controller.awaitSiteLoaded, controller.isJetpackSite, pluginsController.browsePlugins );
-		page( '/plugins/browse/:siteOrCategory?', controller.siteSelection, controller.navigation, controller.awaitSiteLoaded, controller.isJetpackSite, pluginsController.browsePlugins );
+		page( '/plugins/browse/:category/:site', controller.siteSelection, controller.navigation, pluginsController.browsePlugins );
+		page( '/plugins/browse/:siteOrCategory?', controller.siteSelection, controller.navigation, pluginsController.browsePlugins );
 	}
 
 	if ( config.isEnabled( 'manage/plugins/setup' ) ) {
-		page( '/plugins/setup', controller.siteSelection, controller.navigation, controller.awaitSiteLoaded, controller.isJetpackSite, pluginsController.setupPlugins );
-		page( '/plugins/setup/:site', controller.siteSelection, controller.navigation, controller.awaitSiteLoaded, controller.isJetpackSite, pluginsController.setupPlugins );
+		page( '/plugins/setup', controller.siteSelection, controller.navigation, pluginsController.setupPlugins );
+		page( '/plugins/setup/:site', controller.siteSelection, controller.navigation, pluginsController.setupPlugins );
 	}
 
 	if ( config.isEnabled( 'manage/plugins' ) ) {
-		page( '/plugins', controller.siteSelection, controller.navigation, controller.awaitSiteLoaded, controller.isJetpackSite, pluginsController.plugins.bind( null, 'all' ) );
+		page( '/plugins', controller.siteSelection, controller.navigation, pluginsController.plugins.bind( null, 'all' ) );
 		[ 'active', 'inactive', 'updates' ].forEach( function( filter ) {
-			page( '/plugins/' + filter + '/:site_id?', controller.siteSelection, controller.navigation, controller.awaitSiteLoaded, controller.isJetpackSite, pluginsController.jetpackCanUpdate.bind( null, filter ), pluginsController.plugins.bind( null, filter ) );
+			page( '/plugins/' + filter + '/:site_id?', controller.siteSelection, controller.isJetpackSite, pluginsController.jetpackCanUpdate.bind( null, filter ), pluginsController.plugins.bind( null, filter ) );
 		} );
-		page( '/plugins/:plugin/:business_plugin?/:site_id?', controller.siteSelection, controller.navigation, controller.awaitSiteLoaded, controller.isJetpackSite, pluginsController.plugin );
+		page( '/plugins/:plugin/:business_plugin?/:site_id?', controller.siteSelection, controller.isJetpackSite, pluginsController.plugin );
 	}
 };
diff --git a/client/my-sites/plugins/main.jsx b/client/my-sites/plugins/main.jsx
index af29e55c0b4141..1e27eb8f48ca0a 100644
--- a/client/my-sites/plugins/main.jsx
+++ b/client/my-sites/plugins/main.jsx
@@ -8,12 +8,10 @@ import debugModule from 'debug';
 import classNames from 'classnames';
 import some from 'lodash/collection/some';
 import find from 'lodash/collection/find';
-import filter from 'lodash/collection/filter';
 import reject from 'lodash/collection/reject';
 import assign from 'lodash/object/assign';
 import property from 'lodash/utility/property';
 import isEmpty from 'lodash/lang/isEmpty';
-import get from 'lodash/object/get';
 
 /**
  * Internal dependencies
@@ -90,25 +88,18 @@ const PluginsMain = React.createClass( {
 	// plugins for Jetpack sites require additional data from the wporg-data store
 	addWporgDataToPlugins( plugins ) {
 		return plugins.map( plugin => {
-			if ( ! plugin.wpcom ) {
-				let pluginData = WporgPluginsSelectors.getPlugin( this.props.wporgPlugins, plugin.slug );
-				if ( !pluginData ) {
-					this.props.wporgFetchPluginData( plugin.slug );
-				}
-				return assign( {}, plugin, pluginData );
+			let pluginData = WporgPluginsSelectors.getPlugin( this.props.wporgPlugins, plugin.slug );
+			if ( !pluginData ) {
+				this.props.wporgFetchPluginData( plugin.slug );
 			}
-			return plugin;
+			return assign( {}, plugin, pluginData );
 		} );
 	},
 
-	getJetpackPlugins() {
+	getWporgPlugins() {
 		return reject( this.state.plugins, property( 'wpcom' ) );
 	},
 
-	getWpcomPlugins() {
-		return filter( this.state.plugins, property( 'wpcom' ) );
-	},
-
 	getPluginsState( nextProps ) {
 		const sites = this.props.sites.getSelectedOrAllWithPlugins(),
 			pluginUpdate = PluginsStore.getPlugins( sites, 'updates' );
@@ -261,21 +252,14 @@ const PluginsMain = React.createClass( {
 		return some( this.props.sites.getSelectedOrAllWithPlugins(), site => site && site.jetpack && site.canUpdateFiles );
 	},
 
-	shouldShowPluginListPlaceholders( isWpCom ) {
+	shouldShowPluginListPlaceholders() {
 		const { plugins } = this.state;
-		const { sites } = this.props;
-
-		let showPlaceholders = isEmpty( plugins ) && this.isFetchingPlugins();
 
-		if ( showPlaceholders && isWpCom === get( sites.getSelectedSite(), 'jetpack' ) ) {
-			return false;
-		}
-		return showPlaceholders;
+		return isEmpty( plugins ) && this.isFetchingPlugins();
 	},
 
 	renderPluginsContent() {
 		const plugins = this.state.plugins || [];
-		const selectedSite = this.props.sites.getSelectedSite();
 
 		if ( isEmpty( plugins ) && ! this.isFetchingPlugins() ) {
 			if ( this.props.search ) {
@@ -296,21 +280,13 @@ const PluginsMain = React.createClass( {
 		}
 		return (
 			<div className="plugins__lists">
-				{ ( ! selectedSite || selectedSite.jetpack === false ) && <PluginsList
-					header={ this.translate( 'WordPress.com Plugins' ) }
-					plugins={ this.getWpcomPlugins() }
-					isWpCom= { true }
-					sites={ this.props.sites }
-					selectedSite={ selectedSite }
-					isPlaceholder= { this.shouldShowPluginListPlaceholders( true ) } /> }
-				{ ( ! selectedSite || selectedSite.jetpack === true ) && <PluginsList
+				<PluginsList
 					header={ this.translate( 'Plugins' ) }
-					plugins={ this.getJetpackPlugins() }
-					isWpCom={ false }
+					plugins={ this.getWporgPlugins() }
 					sites={ this.props.sites }
 					selectedSite={ this.props.sites.getSelectedSite() }
 					pluginUpdateCount={ this.state.pluginUpdateCount }
-					isPlaceholder= { this.shouldShowPluginListPlaceholders( false ) } /> }
+					isPlaceholder= { this.shouldShowPluginListPlaceholders() } />
 			</div>
 		);
 	},
@@ -336,7 +312,7 @@ const PluginsMain = React.createClass( {
 			slug: 'no-slug',
 			canUpdateFiles: true,
 			name: 'Not a real site'
-		}
+		};
 
 		return plugins.map( plugin => {
 			return <PluginItem
@@ -396,7 +372,7 @@ const PluginsMain = React.createClass( {
 								key: filterItem.id,
 								path: filterItem.path,
 								selected: filterItem.id === this.props.filter,
-							}
+							};
 
 							if ( 'updates' === filterItem.id ) {
 								attr.count = this.state.pluginUpdateCount;
diff --git a/client/my-sites/plugins/plugin-autoupdate-toggle/index.jsx b/client/my-sites/plugins/plugin-autoupdate-toggle/index.jsx
index 833f900b5b9365..cccc6da2b34b2f 100644
--- a/client/my-sites/plugins/plugin-autoupdate-toggle/index.jsx
+++ b/client/my-sites/plugins/plugin-autoupdate-toggle/index.jsx
@@ -20,8 +20,7 @@ module.exports = React.createClass( {
 	propTypes: {
 		isMock: React.PropTypes.bool,
 		site: React.PropTypes.object.isRequired,
-		plugin: React.PropTypes.object.isRequired,
-		wporg: React.PropTypes.bool
+		plugin: React.PropTypes.object.isRequired
 	},
 
 	toggleAutoupdates: function() {
@@ -52,10 +51,6 @@ module.exports = React.createClass( {
 			return null;
 		}
 
-		if ( ! this.props.wporg ) {
-			return this.translate( 'This plugin is not in the WordPress.org plugin repository, so we can\'t autoupdate it.' );
-		}
-
 		if ( ! this.props.site.hasMinimumJetpackVersion ) {
 			return this.translate( '%(site)s is not running an up to date version of Jetpack', {
 				args: { site: this.props.site.title }
diff --git a/client/my-sites/plugins/plugin-information/index.jsx b/client/my-sites/plugins/plugin-information/index.jsx
index 7f81bbdc448266..7880754804a737 100644
--- a/client/my-sites/plugins/plugin-information/index.jsx
+++ b/client/my-sites/plugins/plugin-information/index.jsx
@@ -27,7 +27,6 @@ export default React.createClass( {
 		hasUpdate: React.PropTypes.bool,
 		pluginVersion: React.PropTypes.string,
 		siteVersion: React.PropTypes.oneOfType( [ React.PropTypes.string, React.PropTypes.bool] ),
-		isWpcomPlugin: React.PropTypes.bool,
 	},
 
 	getDefaultProps() {
@@ -164,7 +163,7 @@ export default React.createClass( {
 	},
 
 	renderPlaceholder() {
-		const classes = classNames( { 'plugin-information': true, 'is-placeholder': true, 'is-wpcom-plugin': this.props.isWpcomPlugin } );
+		const classes = classNames( { 'plugin-information': true, 'is-placeholder': true } );
 		return (
 			<div className={ classes } >
 					<div className="plugin-information__wrapper">
@@ -186,31 +185,17 @@ export default React.createClass( {
 							{ this.renderHomepageLink() }
 						</div>
 					</div>
-					{ ! this.props.isWpcomPlugin &&
 					<PluginRatings
 						rating={ this.props.plugin.rating }
 						ratings={ this.props.plugin.ratings }
 						downloaded={ this.props.plugin.downloaded }
 						numRatings={ this.props.plugin.num_ratings }
 						slug={ this.props.plugin.slug }
-						placeholder={ true } /> }
+						placeholder={ true } />
 			</div>
 		);
 	},
 
-	renderWpcom() {
-		return (
-			<div className="plugin-information">
-				<p className="plugin-information__description">
-					{ this.props.plugin.description }
-				</p>
-				<div className="plugin-information__links">
-					{ this.renderWPCOMPluginSupportLink() }
-				</div>
-		</div>
-		);
-	},
-
 	renderWporg() {
 		const classes = classNames( {
 			'plugin-information__version-info': true,
@@ -250,13 +235,6 @@ export default React.createClass( {
 			return this.renderPlaceholder();
 		}
 
-		if ( this.props.plugin.wpcom ) {
-			return this.renderWpcom();
-		}
-
-		if ( this.props.plugin.wporg ) {
-			return this.renderWporg();
-		}
-		return null;
+		return this.renderWporg();
 	}
 } );
diff --git a/client/my-sites/plugins/plugin-item/plugin-item.jsx b/client/my-sites/plugins/plugin-item/plugin-item.jsx
index 4ba50641003c98..a5b769bc7ad459 100644
--- a/client/my-sites/plugins/plugin-item/plugin-item.jsx
+++ b/client/my-sites/plugins/plugin-item/plugin-item.jsx
@@ -171,8 +171,7 @@ module.exports = React.createClass( {
 					plugin={ this.props.plugin }
 					disabled={ this.props.isSelectable }
 					site={ this.props.selectedSite }
-					notices={ this.props.notices }
-					wporg={ !! this.props.plugin.wporg } />
+					notices={ this.props.notices } />
 			</div>
 		);
 	},
diff --git a/client/my-sites/plugins/plugin-list-header/index.jsx b/client/my-sites/plugins/plugin-list-header/index.jsx
index 1303433b3a3e49..4eee8dfdfc2735 100644
--- a/client/my-sites/plugins/plugin-list-header/index.jsx
+++ b/client/my-sites/plugins/plugin-list-header/index.jsx
@@ -51,8 +51,7 @@ export default React.createClass( {
 		bulkManagement: React.PropTypes.bool,
 		sites: React.PropTypes.object.isRequired,
 		plugins: React.PropTypes.array.isRequired,
-		selected: React.PropTypes.array.isRequired,
-		isWpCom: React.PropTypes.bool
+		selected: React.PropTypes.array.isRequired
 	},
 
 	getDefaultProps() {
@@ -106,7 +105,7 @@ export default React.createClass( {
 	},
 
 	canAddNewPlugins() {
-		return config.isEnabled( 'manage/plugins/browser' ) && ! this.props.isWpCom;
+		return config.isEnabled( 'manage/plugins/browser' );
 	},
 
 	canUpdatePlugins() {
@@ -120,7 +119,6 @@ export default React.createClass( {
 	},
 
 	renderCurrentActionButtons() {
-		const { isWpCom } = this.props;
 		let buttons = [];
 		let rightSideButtons = [];
 		let leftSideButtons = [];
@@ -131,7 +129,7 @@ export default React.createClass( {
 		const isJetpackSelected = this.props.selected.some( plugin => 'jetpack' === plugin.slug );
 		const needsRemoveButton = this.props.selected.length && ! hasWpcomPlugins && this.canUpdatePlugins() && ! isJetpackSelected;
 		if ( ! this.props.isBulkManagementActive ) {
-			if ( ! isWpCom && 0 < this.props.pluginUpdateCount ) {
+			if ( 0 < this.props.pluginUpdateCount ) {
 				rightSideButtons.push(
 					<ButtonGroup key="plugin-list-header__buttons-update-all">
 						<Button compact primary onClick={ this.props.updateAllPlugins } >
@@ -147,7 +145,7 @@ export default React.createClass( {
 					</Button>
 				</ButtonGroup>
 			);
-			if ( ! isWpCom && this.canAddNewPlugins() ) {
+			if ( this.canAddNewPlugins() ) {
 				const selectedSite = this.props.sites.getSelectedSite();
 				const browserUrl = '/plugins/browse' + ( selectedSite ? '/' + selectedSite.slug : '' );
 
@@ -174,18 +172,16 @@ export default React.createClass( {
 				);
 			}
 		} else {
-			if ( ! isWpCom ) {
-				const updateButton = (
-					<Button
-						key="plugin-list-header__buttons-update"
-						disabled={ ! this.props.haveUpdatesSelected }
-						compact primary
-						onClick={ this.props.updateSelected }>
-						{ this.translate( 'Update' ) }
-					</Button>
-				);
-				leftSideButtons.push( <ButtonGroup key="plugin-list-header__buttons-update-button">{ updateButton }</ButtonGroup> );
-			}
+			const updateButton = (
+				<Button
+					key="plugin-list-header__buttons-update"
+					disabled={ ! this.props.haveUpdatesSelected }
+					compact primary
+					onClick={ this.props.updateSelected }>
+					{ this.translate( 'Update' ) }
+				</Button>
+			);
+			leftSideButtons.push( <ButtonGroup key="plugin-list-header__buttons-update-button">{ updateButton }</ButtonGroup> );
 
 			activateButtons.push(
 				<Button key="plugin-list-header__buttons-activate" disabled={ ! this.props.haveInactiveSelected } compact onClick={ this.props.activateSelected }>
@@ -212,35 +208,33 @@ export default React.createClass( {
 			activateButtons.push( deactivateButton )
 			leftSideButtons.push( <ButtonGroup key="plugin-list-header__buttons-activate-buttons">{ activateButtons }</ButtonGroup> );
 
-			if ( ! isWpCom ) {
-				autoupdateButtons.push(
-					<Button key="plugin-list-header__buttons-autoupdate-on"
-						disabled={ hasWpcomPlugins || ! this.canUpdatePlugins() }
-						compact
-						onClick={ this.props.setAutoupdateSelected }>
-						{ this.translate( 'Autoupdate' ) }
-					</Button>
-				);
-				autoupdateButtons.push(
-					<Button key="plugin-list-header__buttons-autoupdate-off"
-						disabled={ hasWpcomPlugins || ! this.canUpdatePlugins() }
-						compact
-						onClick={ this.props.unsetAutoupdateSelected }>
-						{ this.translate( 'Disable Autoupdates' ) }
-					</Button>
-				);
+			autoupdateButtons.push(
+				<Button key="plugin-list-header__buttons-autoupdate-on"
+					disabled={ hasWpcomPlugins || ! this.canUpdatePlugins() }
+					compact
+					onClick={ this.props.setAutoupdateSelected }>
+					{ this.translate( 'Autoupdate' ) }
+				</Button>
+			);
+			autoupdateButtons.push(
+				<Button key="plugin-list-header__buttons-autoupdate-off"
+					disabled={ hasWpcomPlugins || ! this.canUpdatePlugins() }
+					compact
+					onClick={ this.props.unsetAutoupdateSelected }>
+					{ this.translate( 'Disable Autoupdates' ) }
+				</Button>
+			);
 
-				leftSideButtons.push( <ButtonGroup key="plugin-list-header__buttons-update-buttons">{ autoupdateButtons }</ButtonGroup> );
-				leftSideButtons.push(
-					<ButtonGroup key="plugin-list-header__buttons-remove-button">
-						<Button compact scary
-							disabled={ ! needsRemoveButton }
-							onClick={ this.props.removePluginNotice }>
-							{ this.translate( 'Remove' ) }
-						</Button>
-					</ButtonGroup>
-				);
-			}
+			leftSideButtons.push( <ButtonGroup key="plugin-list-header__buttons-update-buttons">{ autoupdateButtons }</ButtonGroup> );
+			leftSideButtons.push(
+				<ButtonGroup key="plugin-list-header__buttons-remove-button">
+					<Button compact scary
+						disabled={ ! needsRemoveButton }
+						onClick={ this.props.removePluginNotice }>
+						{ this.translate( 'Remove' ) }
+					</Button>
+				</ButtonGroup>
+			);
 
 			rightSideButtons.push(
 				<button key="plugin-list-header__buttons-close-button"
@@ -263,9 +257,8 @@ export default React.createClass( {
 		let options = [];
 		let actions = [];
 
-		const hasWpcomPlugins = this.props.selected.some( property( 'wpcom' ) );
 		const isJetpackSelected = this.props.selected.some( plugin => 'jetpack' === plugin.slug );
-		const needsRemoveButton = !! this.props.selected.length && ! hasWpcomPlugins && this.canUpdatePlugins() && ! isJetpackSelected;
+		const needsRemoveButton = !! this.props.selected.length && this.canUpdatePlugins() && ! isJetpackSelected;
 
 		if ( this.props.isBulkManagementActive ) {
 			options.push( <DropdownItem key="plugin__actions_title" selected={ true } value="Actions">{ this.translate( 'Actions' ) }</DropdownItem> );
@@ -307,14 +300,14 @@ export default React.createClass( {
 				options.push( <DropdownSeparator key="plugin__actions_separator_2" /> );
 				options.push(
 					<DropdownItem key="plugin__actions_autoupdate"
-						disabled={ hasWpcomPlugins || ! this.canUpdatePlugins() }
+						disabled={ ! this.canUpdatePlugins() }
 						onClick={ this.props.setAutoupdateSelected }>
 						{ this.translate( 'Autoupdate' ) }
 					</DropdownItem>
 				);
 				options.push(
 					<DropdownItem key="plugin__actions_disable_autoupdate"
-						disabled={ hasWpcomPlugins || ! this.canUpdatePlugins() }
+						disabled={ ! this.canUpdatePlugins() }
 						onClick={ this.props.unsetAutoupdateSelected }>
 						{ this.translate( 'Disable Autoupdates' ) }
 					</DropdownItem>
diff --git a/client/my-sites/plugins/plugin-meta/index.jsx b/client/my-sites/plugins/plugin-meta/index.jsx
index 3545a5ada8a1b6..6a25bfd73791a5 100644
--- a/client/my-sites/plugins/plugin-meta/index.jsx
+++ b/client/my-sites/plugins/plugin-meta/index.jsx
@@ -67,7 +67,7 @@ export default React.createClass( {
 		return (
 			<div className="plugin-meta__actions">
 				<PluginActivateToggle plugin={ this.props.plugin } site={ this.props.selectedSite } notices={ this.props.notices } isMock={ this.props.isMock } />
-				<PluginAutoupdateToggle plugin={ this.props.plugin } site={ this.props.selectedSite } notices={ this.props.notices } wporg={ this.props.plugin.wporg } isMock={ this.props.isMock } />
+				<PluginAutoupdateToggle plugin={ this.props.plugin } site={ this.props.selectedSite } notices={ this.props.notices } isMock={ this.props.isMock } />
 				<PluginRemoveButton plugin={ this.props.plugin } site={ this.props.selectedSite } notices={ this.props.notices } isMock={ this.props.isMock } />
 				{ this.renderSettingsLink() }
 			</div>
@@ -284,7 +284,6 @@ export default React.createClass( {
 						{ this.renderActions() }
 					</div>
 					{ ! this.props.isMock && <PluginInformation
-						isWpcomPlugin={ this.props.isWpcomPlugin }
 						plugin={ this.props.plugin }
 						isPlaceholder={ this.props.isPlaceholder }
 						site={ this.props.selectedSite }
diff --git a/client/my-sites/plugins/plugin-site-business/README.md b/client/my-sites/plugins/plugin-site-business/README.md
deleted file mode 100644
index 8e7b6872e423f6..00000000000000
--- a/client/my-sites/plugins/plugin-site-business/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Plugin Site Buisness
-====================
-
-This component is used to display the buisness site's plugin actions.
-
-#### How to use:
-
-```js
-var PluginSiteBusiness = require( 'my-sites/plugins/plugin-site-business' );
-
-render: function() {
-	return (
-		<PluginSiteBusiness
-			site={ this.props.site }
-			notices={ this.props.notices }
-		/>
-	);
-}
-```
-
-#### Props
-
-* `site`: Site object containing with the plugin attribute.
-* `notices` : Notices Object containing inProgress info of the toggle. 
diff --git a/client/my-sites/plugins/plugin-site-business/index.jsx b/client/my-sites/plugins/plugin-site-business/index.jsx
deleted file mode 100644
index 261953b712e45b..00000000000000
--- a/client/my-sites/plugins/plugin-site-business/index.jsx
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * External dependencies
- */
-var React = require( 'react' );
-
-/**
- * Internal dependencies
- */
-var CompactCard = require( 'components/card/compact' ),
-	Site = require( 'my-sites/site' ),
-	PluginActivateToggle = require( 'my-sites/plugins/plugin-activate-toggle' );
-
-module.exports = React.createClass( {
-
-	displayName: 'PluginSiteBusiness',
-
-	propTypes: {
-		site: React.PropTypes.object,
-		notices: React.PropTypes.object,
-	},
-
-	render: function() {
-		if ( ! ( this.props.site && this.props.site.plugin ) && this.props.jetpack ) {
-			return null;
-		}
-
-		return (
-			<CompactCard className="plugin-site plugin-site-business">
-				<Site site={ this.props.site } indicator={ false } />
-				<span className="plugin-site__embed-action plugin-site-business__embed-action">
-					<PluginActivateToggle site={ this.props.site } plugin={ this.props.site.plugin } notices={ this.props.notices } />
-				</span>
-			</CompactCard>
-		);
-	}
-} );
diff --git a/client/my-sites/plugins/plugin-site-business/style.scss b/client/my-sites/plugins/plugin-site-business/style.scss
deleted file mode 100644
index 32d69bea6a99bc..00000000000000
--- a/client/my-sites/plugins/plugin-site-business/style.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-.plugin-site-business.card.is-compact {
-	padding: 8px;
-
-	.site__content {
-		padding: 0;
-	}
-
-	.plugin-site-business__embed-action{
-		position: absolute;
-			top: 0;
-			right: 8px;
-		height: 100%;
-		display: flex;
-		align-items: center;
-	}
-}
\ No newline at end of file
diff --git a/client/my-sites/plugins/plugin-site-list/index.jsx b/client/my-sites/plugins/plugin-site-list/index.jsx
index b1b68a6bb8ce06..987dd63d89238a 100644
--- a/client/my-sites/plugins/plugin-site-list/index.jsx
+++ b/client/my-sites/plugins/plugin-site-list/index.jsx
@@ -26,9 +26,9 @@ module.exports = React.createClass( {
 
 	getSecondaryPluginSites: function( site ) {
 		let secondarySites = allSites.getNetworkSites( site );
-		let secondaryPluginSites = site.plugin ?
-			PluginsStore.getSites( secondarySites, this.props.plugin.slug ) :
-			secondarySites;
+		let secondaryPluginSites = site.plugin
+			? PluginsStore.getSites( secondarySites, this.props.plugin.slug )
+			: secondarySites;
 		return compact( secondaryPluginSites );
 	},
 
@@ -38,7 +38,6 @@ module.exports = React.createClass( {
 				site={ site }
 				secondarySites={ this.getSecondaryPluginSites( site ) }
 				plugin={ this.props.plugin }
-				wporg={ this.props.wporg }
 				notices={ this.props.notices } />;
 	},
 
diff --git a/client/my-sites/plugins/plugin-site/README.md b/client/my-sites/plugins/plugin-site/README.md
index 8e61a3b2f7b90c..9bf3d0472dd848 100644
--- a/client/my-sites/plugins/plugin-site/README.md
+++ b/client/my-sites/plugins/plugin-site/README.md
@@ -1,7 +1,7 @@
 Plugin Site
 ===========
 
-This component is used to represent the state of a single instance of a plugin in a site. Internally, it follows a factory pattern, returning one instance of `plugin-site-network`, `plugin-site-business` or `plugin-site-jetpack` depending on the properties of the site received.
+This component is used to represent the state of a single instance of a plugin in a site. Internally, it follows a factory pattern, returning one instance of `plugin-site-network` or `plugin-site-jetpack` depending on the properties of the site received.
 
 #### How to use:
 
@@ -13,7 +13,6 @@ render: function() {
             site={ site }
             secondarySites={ this.getSecondaryPluginSites( site ) }
             plugin={ this.state.plugin }
-            wporg={ this.state.plugin.wporg }
             notices={ this.state.notices } />;
 }
 ```
@@ -24,4 +23,3 @@ render: function() {
 * `secondarySites`: if `site` is a network site, secondarySites should contain an array with the lists secondary sites of the network.
 * `plugin`: a plugin data object.
 * `notices`: a notices object
-* `wporg`: (boolean) whether the plugin is from the .org repository or not
diff --git a/client/my-sites/plugins/plugin-site/plugin-site.jsx b/client/my-sites/plugins/plugin-site/plugin-site.jsx
index 55d5920a8f42e4..824f3206f3d681 100644
--- a/client/my-sites/plugins/plugin-site/plugin-site.jsx
+++ b/client/my-sites/plugins/plugin-site/plugin-site.jsx
@@ -7,8 +7,7 @@ var React = require( 'react' );
  * Internal dependencies
  */
 var PluginSiteJetpack = require( 'my-sites/plugins/plugin-site-jetpack' ),
-	PluginSiteNetwork = require( 'my-sites/plugins/plugin-site-network' ),
-	PluginSiteBusiness = require( 'my-sites/plugins/plugin-site-business' );
+	PluginSiteNetwork = require( 'my-sites/plugins/plugin-site-network' );
 
 module.exports = React.createClass( {
 
@@ -19,10 +18,6 @@ module.exports = React.createClass( {
 			return;
 		}
 
-		if ( ! this.props.wporg ) {
-			return <PluginSiteBusiness { ...this.props } />;
-		}
-
 		if ( this.props.site.jetpack && this.props.secondarySites && this.props.secondarySites.length ) {
 			return <PluginSiteNetwork { ...this.props } />;
 		}
diff --git a/client/my-sites/plugins/plugin.jsx b/client/my-sites/plugins/plugin.jsx
index bc221c8e058e84..dca9e684b8874b 100644
--- a/client/my-sites/plugins/plugin.jsx
+++ b/client/my-sites/plugins/plugin.jsx
@@ -85,7 +85,7 @@ const SinglePlugin = React.createClass( {
 			selectedSite = this.props.sites.getSelectedSite();
 
 		// .com sites can't install non .com plugins, if that's the case we don't retrieve any data from the store
-		if ( ! props.isWpcomPlugin && selectedSite && ! selectedSite.jetpack ) {
+		if ( selectedSite && ! selectedSite.jetpack ) {
 			return {
 				accessError: false,
 				sites: [],
@@ -94,16 +94,13 @@ const SinglePlugin = React.createClass( {
 			};
 		}
 
-		const allSites = uniq( props.sites.getSelectedOrAllWithPlugins() ),
-			sites = props.isWpcomPlugin
-				? reject( allSites, property( 'jetpack' ) )
-				: filter( allSites, property( 'jetpack' ) ),
+		const sites = uniq( props.sites.getSelectedOrAllWithPlugins() ),
 			sitePlugin = PluginsStore.getPlugin( sites, props.pluginSlug );
 
 		let plugin = Object.assign( {
 			name: props.pluginSlug,
 			id: props.pluginSlug,
-			slug: props.pluginSlug,
+			slug: props.pluginSlug
 		}, sitePlugin );
 
 		return {
@@ -195,11 +192,11 @@ const SinglePlugin = React.createClass( {
 	},
 
 	isFetching() {
-		return ! this.props.isWpcomPlugin && WporgPluginsSelectors.isFetching( this.props.wporgPlugins, this.props.pluginSlug );
+		return WporgPluginsSelectors.isFetching( this.props.wporgPlugins, this.props.pluginSlug );
 	},
 
 	isFetched() {
-		return this.props.isWpcomPlugin || WporgPluginsSelectors.isFetched( this.props.wporgPlugins, this.props.pluginSlug );
+		return WporgPluginsSelectors.isFetched( this.props.wporgPlugins, this.props.pluginSlug );
 	},
 
 	isFetchingSites() {
@@ -209,10 +206,9 @@ const SinglePlugin = React.createClass( {
 
 	getPlugin() {
 		let plugin = Object.assign( {}, this.state.plugin );
-		if ( ! this.props.isWpcomPlugin ) {
-			// if it isn't a .com plugin, assign it .org details
-			plugin = Object.assign( plugin, WporgPluginsSelectors.getPlugin( this.props.wporgPlugins, this.props.pluginSlug ) );
-		}
+		// assign it .org details
+		plugin = Object.assign( plugin, WporgPluginsSelectors.getPlugin( this.props.wporgPlugins, this.props.pluginSlug ) );
+
 		return plugin;
 	},
 
@@ -240,44 +236,35 @@ const SinglePlugin = React.createClass( {
 			return;
 		}
 
-		if ( plugin.wporg ) {
-			return (
-				<div>
-					<PluginSiteList
-						className="plugin__installed-on"
-						title={ this.translate( 'Installed on', { comment: 'header for list of sites a plugin is installed on' } ) }
-						sites={ this.state.sites }
-						plugin={ plugin }
-						notices={ this.state.notices }
-						wporg={ true } />
-					<PluginSiteList
-						className="plugin__not-installed-on"
-						title={ this.translate( 'Available sites', { comment: 'header for list of sites a plugin can be installed on' } ) }
-						sites={ this.state.notInstalledSites }
-						plugin={ plugin }
-						notices={ this.state.notices }
-						wporg={ true } />
-				</div>
-			);
-		}
-		return <PluginSiteList
+		return (
+			<div>
+				<PluginSiteList
 					className="plugin__installed-on"
-					title={ this.translate( 'Available on', { comment: 'header for list of sites a plugin is available on' } ) }
+					title={ this.translate( 'Installed on', { comment: 'header for list of sites a plugin is installed on' } ) }
 					sites={ this.state.sites }
 					plugin={ plugin }
-					notices={ this.state.notices } />
+					notices={ this.state.notices }
+					wporg={ true } />
+				<PluginSiteList
+					className="plugin__not-installed-on"
+					title={ this.translate( 'Available sites', { comment: 'header for list of sites a plugin can be installed on' } ) }
+					sites={ this.state.notInstalledSites }
+					plugin={ plugin }
+					notices={ this.state.notices }
+					wporg={ true } />
+			</div>
+		);
 	},
 
-	renderPluginPlaceholder( classes ) {
+	renderPluginPlaceholder() {
 		const selectedSite = this.props.sites.getSelectedSite();
 		return (
 			<MainComponent>
 				<SidebarNavigation />
-				<div className={ classes }>
+				<div className="plugin__page" >
 					{ this.displayHeader() }
 					<PluginMeta
 						isPlaceholder
-						isWpcomPlugin={ this.props.isWpcomPlugin }
 						notices={ this.state.notices }
 						isInstalledOnSite={ this.isFetchingSites() ? null : !! PluginsStore.getSitePlugin( selectedSite, this.state.plugin.slug ) }
 						plugin={ this.getPlugin() }
@@ -297,14 +284,14 @@ const SinglePlugin = React.createClass( {
 			options: {
 				software_version: '1'
 			}
-		}
+		};
+
 		return (
 			<MainComponent>
 				<div className="plugin__page">
 					{ this.displayHeader() }
 					<PluginMeta
 						notices={ {} }
-						isWpcomPlugin={ this.props.isWpcomPlugin }
 						isInstalledOnSite={ !! PluginsStore.getSitePlugin( selectedSite, this.state.plugin.slug ) }
 						plugin={ this.getPlugin() }
 						siteUrl={ 'no-real-url' }
@@ -317,10 +304,9 @@ const SinglePlugin = React.createClass( {
 	},
 
 	render() {
-		const selectedSite = this.props.sites.getSelectedSite(),
-			classes = classNames( 'plugin__page', { 'is-wpcom': this.props.isWpcomPlugin } );
+		const selectedSite = this.props.sites.getSelectedSite();
 
-		if ( ! this.props.isWpcomPlugin && selectedSite && ! selectedSite.jetpack ) {
+		if ( selectedSite && ! selectedSite.jetpack ) {
 			return (
 				<MainComponent>
 					<SidebarNavigation />
@@ -346,7 +332,7 @@ const SinglePlugin = React.createClass( {
 		const pluginExists = this.pluginExists( plugin );
 
 		if ( pluginExists === 'unknown' ) {
-			return this.renderPluginPlaceholder( classes );
+			return this.renderPluginPlaceholder();
 		}
 
 		if ( pluginExists === false ) {
@@ -372,10 +358,9 @@ const SinglePlugin = React.createClass( {
 		return (
 			<MainComponent>
 				<SidebarNavigation />
-				<div className={ classes }>
+				<div className="plugin__page">
 					{ this.displayHeader() }
 					<PluginMeta
-						isWpcomPlugin={ this.props.isWpcomPlugin }
 						notices={ this.state.notices }
 						plugin={ plugin }
 						siteUrl={ this.props.siteUrl }
diff --git a/client/my-sites/plugins/plugins-list/index.jsx b/client/my-sites/plugins/plugins-list/index.jsx
index 462242ca62a5d7..d6dd2226a27280 100644
--- a/client/my-sites/plugins/plugins-list/index.jsx
+++ b/client/my-sites/plugins/plugins-list/index.jsx
@@ -32,11 +32,8 @@ export default React.createClass( {
 			sites: PropTypes.array,
 			slug: PropTypes.string,
 			name: PropTypes.string,
-			wpcom: PropTypes.bool,
-			wporg: PropTypes.bool,
 		} ) ).isRequired,
 		header: PropTypes.string.isRequired,
-		isWpCom: PropTypes.bool.isRequired,
 		sites: PropTypes.object.isRequired,
 		selectedSite: PropTypes.oneOfType( [ PropTypes.bool, PropTypes.object ] ).isRequired,
 		pluginUpdateCount: PropTypes.number,
@@ -52,15 +49,11 @@ export default React.createClass( {
 	},
 
 	componentDidMount() {
-		if ( this.props.isWpCom !== true ) {
-			PluginsLog.on( 'change', this.showDisconnectDialog );
-		}
+		PluginsLog.on( 'change', this.showDisconnectDialog );
 	},
 
 	componentWillUnmount() {
-		if ( this.props.isWpCom !== true ) {
-			PluginsLog.removeListener( 'change', this.showDisconnectDialog );
-		}
+		PluginsLog.removeListener( 'change', this.showDisconnectDialog );
 	},
 
 	isSelected( { slug } ) {
@@ -111,13 +104,6 @@ export default React.createClass( {
 		}
 	},
 
-	getPluginUpdateCount() {
-		if ( this.props.isWpCom ) {
-			return 0;
-		}
-		return this.props.pluginUpdateCount;
-	},
-
 	hasNoSitesThatCanManage( plugin ) {
 		return ! plugin.wpcom &&
 			! plugin.sites.some( site => includes( site.modules || [], 'manage' ) );
@@ -164,13 +150,13 @@ export default React.createClass( {
 	},
 
 	doActionOverSelected( actionName, action ) {
-		const isDeactivatingAndJetpackSelected = ( { slug } ) => 'deactivating' === actionName && 'jetpack' === slug;
+		const isDeactivating = ( { slug } ) => 'deactivating' === actionName;
 		const flattenArrays = ( full, partial ) => [ ...full, ...partial ];
 		this.removePluginsNotices();
 
 		this.props.plugins
 			.filter( this.isSelected ) // only use selected sites
-			.filter( negate( isDeactivatingAndJetpackSelected ) ) // ignore sites that are deactiving
+			.filter( negate( isDeactivating ) ) // ignore sites that are deactiving
 			.map( p => p.sites ) // list of plugins -> list of list of sites
 			.reduce( flattenArrays, [] ) // flatten the list into one big list of sites
 			.forEach( site => action( site, site.plugin ) );
@@ -353,7 +339,6 @@ export default React.createClass( {
 		return (
 			<div className="plugins-list" >
 				<PluginsListHeader label={ this.props.header }
-					isWpCom={ this.props.isWpCom }
 					isBulkManagementActive={ !! this.state.bulkManagement }
 					sites={ this.props.sites }
 					plugins={ this.props.plugins }
@@ -361,7 +346,7 @@ export default React.createClass( {
 					toggleBulkManagement={ this.toggleBulkManagement }
 					updateAllPlugins={ this.updateAllPlugins }
 					updateSelected= { this.updateSelected }
-					pluginUpdateCount={ this.getPluginUpdateCount() }
+					pluginUpdateCount={ this.props.pluginUpdateCount }
 					activateSelected={ this.activateSelected }
 					deactiveAndDisconnectSelected={ this.deactiveAndDisconnectSelected }
 					deactivateSelected={ this.deactivateSelected }
@@ -373,7 +358,7 @@ export default React.createClass( {
 					haveInactiveSelected={ this.props.plugins.some( this.filterSelection.inactive.bind( this ) ) }
 					haveUpdatesSelected= { this.props.plugins.some( this.filterSelection.updates.bind( this ) ) } />
 				<div className={ itemListClasses }>{ this.props.plugins.map( this.renderPlugin ) }</div>
-				{ ! this.props.isWpCom && <DisconnectJetpackDialog ref="dialog" site={ this.props.site } sites={ this.props.sites } redirect="/plugins" /> }
+				<DisconnectJetpackDialog ref="dialog" site={ this.props.site } sites={ this.props.sites } redirect="/plugins" />
 			</div>
 		);
 	},
@@ -393,12 +378,12 @@ export default React.createClass( {
 				isSelectable={ this.state.bulkManagement }
 				onClick={ selectThisPlugin }
 				selectedSite={ this.props.selectedSite }
-				pluginLink={ '/plugins/' + encodeURIComponent( plugin.slug ) + ( plugin.wpcom ? '/business' : '' ) + this.siteSuffix() } />
+				pluginLink={ '/plugins/' + encodeURIComponent( plugin.slug ) + this.siteSuffix() } />
 		);
 	},
 
 	renderPlaceholders() {
-		const placeholderCount = this.props.isWpCom ? 3 : 16;
+		const placeholderCount = 16;
 		return range( placeholderCount ).map( i => <PluginItem key={ 'placeholder-' + i } /> );
 	}
 } );
diff --git a/client/my-sites/sidebar/sidebar.jsx b/client/my-sites/sidebar/sidebar.jsx
index 0c9b81a7bbf019..7bb105d6dd6948 100644
--- a/client/my-sites/sidebar/sidebar.jsx
+++ b/client/my-sites/sidebar/sidebar.jsx
@@ -1,30 +1,30 @@
 /**
  * External dependencies
  */
-var React = require( 'react' ),
+var analytics = require( 'analytics' ),
 	classNames = require( 'classnames' ),
+	contains = require( 'lodash/collection/contains' ),
 	debug = require( 'debug' )( 'calypso:my-sites:sidebar' ),
-	analytics = require( 'analytics' ),
-	startsWith = require( 'lodash/string/startsWith' ),
 	has = require( 'lodash/object/has' ),
-	contains = require( 'lodash/collection/contains' );
+	React = require( 'react' ),
+	startsWith = require( 'lodash/string/startsWith' );
 
 /**
  * Internal dependencies
  */
-var config = require( 'config' ),
+var abtest = require( 'lib/abtest' ).abtest,
+	AdsUtils = require( 'lib/ads/utils' ),
+	config = require( 'config' ),
 	CurrentSite = require( 'my-sites/current-site' ),
-	PublishMenu = require( './publish-menu' ),
-	SiteStatsStickyLink = require( 'components/site-stats-sticky-link' ),
-	productsValues = require( 'lib/products-values' ),
 	getCustomizeUrl = require( 'lib/themes/helpers' ).getCustomizeUrl,
-	AdsUtils = require( 'lib/ads/utils' ),
 	Gridicon = require( 'components/gridicon' ),
+	productsValues = require( 'lib/products-values' ),
+	PublishMenu = require( './publish-menu' ),
 	Sidebar = require( 'layout/sidebar' ),
 	SidebarHeading = require( 'layout/sidebar/heading' ),
 	SidebarItem = require( 'layout/sidebar/item' ),
 	SidebarMenu = require( 'layout/sidebar/menu' ),
-	abtest = require( 'lib/abtest' ).abtest;
+	SiteStatsStickyLink = require( 'components/site-stats-sticky-link' );
 
 module.exports = React.createClass( {
 	displayName: 'MySitesSidebar',
@@ -219,37 +219,43 @@ module.exports = React.createClass( {
 	plugins: function() {
 		var site = this.getSelectedSite(),
 			pluginsLink = '/plugins' + this.siteSuffix(),
-			pluginsBrowseLink = '/plugins/browse' + this.siteSuffix(),
-			addPluginsButton;
+			addPluginsButton,
+			noticon,
+			target;
 
-		if ( ! this.isSingle() && ! config.isEnabled( 'manage/plugins' ) ) {
-			return null;
+		if ( ! config.isEnabled( 'manage/plugins' ) ) {
+			if ( ! this.isSingle() ) {
+				return null;
+			}
+
+			if ( site.options ) {
+				pluginsLink = site.options.admin_url + 'plugins.php';
+			}
+
+			target = '_blank';
+			noticon = <span className="noticon noticon-external" />;
 		}
 
 		if ( ! this.props.sites.canManageSelectedOrAll() ) {
 			return null;
 		}
 
-		if ( ! this.props.sites.hasSiteWithPlugins() && ! this.isSingle() ) {
+		if ( ! this.props.sites.hasSiteWithPlugins() ) {
 			return null;
 		}
 
-		if ( ! config.isEnabled( 'manage/plugins' ) && site.options ) {
-			pluginsLink = site.options.admin_url + 'plugins.php';
-		}
-
 		if ( config.isEnabled( 'manage/plugins/browser' ) ) {
-			if ( ( this.isSingle() && site.jetpack ) || ( this.hasJetpackSites() && ! this.isSingle() ) ) {
-				addPluginsButton = <a onClick={ this.onNavigate } href={ pluginsBrowseLink } className="add-new">{ this.translate( 'Add' ) }</a>;
+			if ( ( this.isSingle() && site.jetpack ) || ( ! this.isSingle() && this.hasJetpackSites() ) ) {
+				addPluginsButton = <a onClick={ this.onNavigate } href={ '/plugins/browse' + this.siteSuffix() } className="add-new">{ this.translate( 'Add' ) }</a>;
 			}
 		}
 
 		return (
 			<li className={ this.itemLinkClass( '/plugins', 'plugins' ) }>
-				<a onClick={ this.onNavigate } href={ pluginsLink } target={ ! config.isEnabled( 'manage/plugins' ) ? '_blank' : null }>
+				<a onClick={ this.onNavigate } href={ pluginsLink } target={ target }>
 					<Gridicon icon="plugins" size={ 24 } />
 					<span className="menu-link-text">{ this.translate( 'Plugins' ) }</span>
-					{ ! config.isEnabled( 'manage/plugins' ) ? <span className="noticon noticon-external" /> : null }
+					{ noticon }
 				</a>
 				{ addPluginsButton }
 			</li>
@@ -258,28 +264,23 @@ module.exports = React.createClass( {
 
 	upgrades: function() {
 		var site = this.getSelectedSite(),
-			target = null,
 			domainsLink = '/domains' + this.siteSuffix(),
 			addDomainLink = '/domains/add' + this.siteSuffix(),
 			addDomainButton = '';
 
-		if ( ! site ) {
-			return null;
-		}
-
-		if ( ! site.capabilities ) {
+		if ( ! config.isEnabled( 'manage/plans' ) ) {
 			return null;
 		}
 
-		if ( site.capabilities && ! site.capabilities.manage_options ) {
+		if ( ! this.isSingle() ) {
 			return null;
 		}
 
-		if ( ! this.isSingle() && ! config.isEnabled( 'manage/plans' ) ) {
+		if ( ! site.capabilities ) {
 			return null;
 		}
 
-		if ( ! config.isEnabled( 'manage/plans' ) ) {
+		if ( site.capabilities && ! site.capabilities.manage_options ) {
 			return null;
 		}
 
@@ -293,7 +294,7 @@ module.exports = React.createClass( {
 
 		return (
 			<li className={ this.itemLinkClass( [ '/domains' ], 'domains' ) }>
-				<a onClick={ this.onNavigate } href={ domainsLink } target={ target }>
+				<a onClick={ this.onNavigate } href={ domainsLink }>
 					<Gridicon icon="cart" size={ 24 } />
 					<span className="menu-link-text">{ this.translate( 'Domains' ) }</span>
 				</a>
@@ -531,7 +532,7 @@ module.exports = React.createClass( {
 			return null;
 		}
 
-		site = this.getSelectedSite()
+		site = this.getSelectedSite();
 		viplink = '/vip/deploys' + this.siteSuffix();
 
 		if ( ! site ) {