Index: /Users/mh/Documents/workspace/7.3/server/Slim/Buttons/Home.pm
===================================================================
--- /Users/mh/Documents/workspace/7.3/server/Slim/Buttons/Home.pm	(revision 23393)
+++ /Users/mh/Documents/workspace/7.3/server/Slim/Buttons/Home.pm	(working copy)
@@ -596,11 +596,6 @@
 			next;
 		}
 		
-		# Leakage of the Sub/Head Out plugin..
-		if ($sub eq 'PLUGIN_SUB_HEAD_OUT' && !$client->hasHeadSubOut) {
-			next;
-		}
-
 		if ( main::SLIM_SERVICE ) {
 			# Hide disabled menus
 			if ( exists $disabledMenus{$sub} ) {
@@ -799,11 +794,6 @@
 		delete $menuChoices{'PLUGIN_LINE_IN'};
 	}
 
-	# Leakage from Sub/Head Out Plugin
-	if (defined $menuChoices{'PLUGIN_SUB_HEAD_OUT'} && !$client->hasHeadSubOut) {
-		delete $menuChoices{'PLUGIN_SUB_HEAD_OUT'};
-	}
-
 	for my $usedOption (@{$homeChoices{$client}}) {
 		delete $menuChoices{$usedOption};
 	}
@@ -866,11 +856,6 @@
 			next;
 		}
 
-		# more leakage of the Sub/Head Out plugin..
-		if ($menuItem eq 'PLUGIN_SUB_HEAD_OUT' && !($client->hasHeadSubOut && $client->lineOutConnected)) {
-			next;
-		}
-
 		my $plugin = Slim::Utils::PluginManager->dataForPlugin($menuItem);
 
 		if (!exists $home{$menuItem} && !defined $plugin) {
Index: /Users/mh/Documents/workspace/7.3/server/Slim/Player/Boom.pm
===================================================================
--- /Users/mh/Documents/workspace/7.3/server/Slim/Player/Boom.pm	(revision 23393)
+++ /Users/mh/Documents/workspace/7.3/server/Slim/Player/Boom.pm	(working copy)
@@ -208,10 +208,6 @@
 	return 0;
 }
 
-sub hasHeadSubOut() {
-	return 1; 
-}
-
 sub hasPowerControl {
 	return 0;
 }
Index: /Users/mh/Documents/workspace/7.3/server/Slim/Player/Client.pm
===================================================================
--- /Users/mh/Documents/workspace/7.3/server/Slim/Player/Client.pm	(revision 23393)
+++ /Users/mh/Documents/workspace/7.3/server/Slim/Player/Client.pm	(working copy)
@@ -645,7 +645,6 @@
 	return undef;
 }
 
-sub hasHeadSubOut() { return 0; }
 sub hasDigitalOut() { return 0; }
 sub hasVolumeControl() { return 0; }
 sub hasEffectsLoop() { return 0; }