diff --git a/OSBindings/Mac/Clock Signal/MachinePicker/MachinePicker.swift b/OSBindings/Mac/Clock Signal/MachinePicker/MachinePicker.swift
index b96df685d..c8f3872fe 100644
--- a/OSBindings/Mac/Clock Signal/MachinePicker/MachinePicker.swift	
+++ b/OSBindings/Mac/Clock Signal/MachinePicker/MachinePicker.swift	
@@ -86,15 +86,12 @@ class MachinePicker: NSObject, NSTableViewDataSource, NSTableViewDelegate {
 
 		// TEMPORARY: remove the Apple IIgs and PC compatible options.
 		// Neither is yet a fully-working machine.
-		let appleIIgsTabIndex = machineSelector.indexOfTabViewItem(withIdentifier: "appleiigs")
-		machineSelector.removeTabViewItem(machineSelector.tabViewItem(at: appleIIgsTabIndex))
-
-//		let pcTabIndex = machineSelector.indexOfTabViewItem(withIdentifier: "pc")
-//		machineSelector.removeTabViewItem(machineSelector.tabViewItem(at: pcTabIndex))
-
+		for hidden in ["appleiigs", "pc"] {
+			let tabIndex = machineSelector.indexOfTabViewItem(withIdentifier: hidden)
+			machineSelector.removeTabViewItem(machineSelector.tabViewItem(at: tabIndex))
+		}
 		machineNameTable.reloadData()
 
-
 		// Machine type
 		if let machineIdentifier = standardUserDefaults.string(forKey: "new.machine") {
 			// If I've changed my mind about visible tabs between versions, there may not be one that corresponds