diff --git a/src/plug/JaySynthAudioProcessorEditor.cpp b/src/plug/JaySynthAudioProcessorEditor.cpp
index 499d074..9f233b5 100644
--- a/src/plug/JaySynthAudioProcessorEditor.cpp
+++ b/src/plug/JaySynthAudioProcessorEditor.cpp
@@ -5045,10 +5045,6 @@ void JaySynthAudioProcessorEditor::mouseDown (const MouseEvent &m)
 	if (m.mods.isRightButtonDown() && m.mods.isShiftDown())
 	{
 		// Comboboxes don't support midicontroller assignments
-		if (componentThatWasClicked->getComponentID().contains(String("PARAM_COMBOBOX")))
-		{
-			return;
-		}
 		MidiCC_PopUp_show(componentThatWasClicked);
 	}
 }
@@ -5164,10 +5160,6 @@ void JaySynthAudioProcessorEditor::MidiCC_PopUp_event(int event)
 	switch (event)
 	{
 		case MidiCC_PopUp::POPUP_OK:
-			paramID = m_MidiCC_PopUp->getParamID();
-			getProcessor()->setParam(paramID, m_MidiCC_PopUp->getCurrentParamValue(), false, false);
-			getProcessor()->controlParam(paramID, m_MidiCC_PopUp->getCurrentControlValue());
-			m_label_patch_name->setText(getProcessor()->getCurrentProgramName(), juce::NotificationType::dontSendNotification);
 			deleteAndZero (m_MidiCC_PopUp);
 			break;
 
diff --git a/src/plug/MidiCC_PopUp.cpp b/src/plug/MidiCC_PopUp.cpp
index 453db7b..9c6c371 100644
--- a/src/plug/MidiCC_PopUp.cpp
+++ b/src/plug/MidiCC_PopUp.cpp
@@ -306,8 +306,6 @@ void MidiCC_PopUp::buttonClicked (Button* buttonThatWasClicked)
 		}
 		GetMin();
 		GetMax();
-		restoreTestSlider();
-		TestValueUpdate();
         //[/UserButtonCode_button_move_sliders_enable]
     }
     else if (buttonThatWasClicked == button_assign_enable)
@@ -323,8 +321,6 @@ void MidiCC_PopUp::buttonClicked (Button* buttonThatWasClicked)
 			currentParamValue = toParam(pMidiCC->getParam(pMidiCC_container), (synth_float_t)lastMidiCCvalue);
 			currentControlValue = toParam(pMidiCC->getControl(pMidiCC_container), (synth_float_t)lastMidiCCvalue);
 		}
-		restoreTestSlider();
-		TestValueUpdate();
         //[/UserButtonCode_button_assign_enable]
     }
     else if (buttonThatWasClicked == button_midi_learn)
@@ -337,8 +333,6 @@ void MidiCC_PopUp::buttonClicked (Button* buttonThatWasClicked)
         //[UserButtonCode_button_apply_on_patch_init] -- add your button handler code here..
 		state = buttonThatWasClicked->getToggleState();
 		pMidiCC->setDoApplyOnPatchInit(pMidiCC_container, state);
-		restoreTestSlider();
-		TestValueUpdate();
         //[/UserButtonCode_button_apply_on_patch_init]
     }
 
@@ -363,24 +357,18 @@ void MidiCC_PopUp::labelTextChanged (Label* labelThatHasChanged)
 			currentParamValue = toParam(pMidiCC->getParam(pMidiCC_container), (synth_float_t)lastMidiCCvalue);
 			currentControlValue = toParam(pMidiCC->getControl(pMidiCC_container), (synth_float_t)lastMidiCCvalue);
 		}
-		restoreTestSlider();
-		TestValueUpdate();
         //[/UserLabelCode_label_MidiCC_ID]
     }
     else if (labelThatHasChanged == label_control_min)
     {
         //[UserLabelCode_label_control_min] -- add your label text handling code here..
 		SetMin();
-		restoreTestSlider();
-		TestValueUpdate();
         //[/UserLabelCode_label_control_min]
     }
     else if (labelThatHasChanged == label_control_max)
     {
         //[UserLabelCode_label_control_max] -- add your label text handling code here..
 		SetMax();
-		restoreTestSlider();
-		TestValueUpdate();
         //[/UserLabelCode_label_control_max]
     }
 
diff --git a/src/plug/MidiCC_PopUp.h b/src/plug/MidiCC_PopUp.h
index acd85ed..f34a997 100644
--- a/src/plug/MidiCC_PopUp.h
+++ b/src/plug/MidiCC_PopUp.h
@@ -91,7 +91,6 @@ public:
 			currentControlValue = toParam(pMidiCC->getControl(pMidiCC_container), (synth_float_t)lastMidiCCvalue);
 		}
 		restoreTestSlider();
-		TestValueUpdate();
 
 		if (!button_midi_learn->getToggleState())
 			return;