diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
index bbca53f780..527afe1d96 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
@@ -36,11 +36,6 @@ namespace BizHawk.Client.Common
 		{
 			get
 			{
-				if (index == 9)
-				{
-					int zzz = 0;
-				}
-
 				return new TasMovieRecord
 				{
 					State = StateManager[index],
diff --git a/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs
index 1699cc109c..9c2d449ffc 100644
--- a/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs
+++ b/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs
@@ -79,7 +79,6 @@
 			this.ProfileSelectComboBox.Name = "ProfileSelectComboBox";
 			this.ProfileSelectComboBox.Size = new System.Drawing.Size(156, 21);
 			this.ProfileSelectComboBox.TabIndex = 2;
-			this.ProfileSelectComboBox.SelectedIndexChanged += new System.EventHandler(this.ProfileSelectComboBox_SelectedIndexChanged);
 			// 
 			// SaveScreenshotStatesCheckBox
 			// 
diff --git a/BizHawk.Client.EmuHawk/config/ProfileConfig.cs b/BizHawk.Client.EmuHawk/config/ProfileConfig.cs
index b826701ff0..20c720a0d8 100644
--- a/BizHawk.Client.EmuHawk/config/ProfileConfig.cs
+++ b/BizHawk.Client.EmuHawk/config/ProfileConfig.cs
@@ -23,7 +23,6 @@ namespace BizHawk.Client.EmuHawk
 		// TODO:
 		// Save the profile selected to Global.Config (Casual is the default)
 		// Default the dropdown to the current profile selected instead of empty
-		// Put save logic in the Ok button click, not the profile selected change event!
 
 		public ProfileConfig()
 		{
@@ -32,30 +31,15 @@ namespace BizHawk.Client.EmuHawk
 
 		private void ProfileConfig_Load(object sender, EventArgs e)
 		{
+			if (!VersionInfo.DeveloperBuild)
+			{
+				ProfileSelectComboBox.Items.Remove("Custom Profile");
+			}
 		}
 
 		private void OkBtn_Click(object sender, EventArgs e)
 		{
-			/* Saving logic goes here */
-			if (ProfileSelectComboBox.SelectedIndex == 3)
-			{
-				//If custom profile, check all the checkboxes
-				//Save to config.ini
-			}
-
-			DialogResult = DialogResult.OK;
-			Close();
-		}
-
-		private void CancelBtn_Click(object sender, EventArgs e)
-		{
-			DialogResult = DialogResult.Cancel;
-			Close();
-		}
-
-		private void ProfileSelectComboBox_SelectedIndexChanged(object sender, EventArgs e)
-		{
-			if (ProfileSelectComboBox.SelectedIndex == 0) //Casual Gaming
+			if (ProfileSelectComboBox.SelectedIndex == 0) // Casual Gaming
 			{
 				DisplayProfileSettingBoxes(false);
 				Global.Config.SaveLargeScreenshotWithStates = false;
@@ -109,7 +93,7 @@ namespace BizHawk.Client.EmuHawk
 				// NES
 				Global.Config.NES_InQuickNES = true;
 			}
-			else if (ProfileSelectComboBox.SelectedIndex == 2) //Long Plays
+			else if (ProfileSelectComboBox.SelectedIndex == 2) // Long Plays
 			{
 				DisplayProfileSettingBoxes(false);
 				Global.Config.SaveLargeScreenshotWithStates = false;
@@ -163,7 +147,7 @@ namespace BizHawk.Client.EmuHawk
 				// NES
 				Global.Config.NES_InQuickNES = true;
 			}
-			else if (ProfileSelectComboBox.SelectedIndex == 1) //TAS
+			else if (ProfileSelectComboBox.SelectedIndex == 1) // TAS
 			{
 				DisplayProfileSettingBoxes(false);
 
@@ -225,6 +209,15 @@ namespace BizHawk.Client.EmuHawk
 				//Disabled for now
 				//DisplayProfileSettingBoxes(true);
 			}
+
+			DialogResult = DialogResult.OK;
+			Close();
+		}
+
+		private void CancelBtn_Click(object sender, EventArgs e)
+		{
+			DialogResult = DialogResult.Cancel;
+			Close();
 		}
 
 		private void DisplayProfileSettingBoxes(bool cProfile)