clean-up combobox and scrollbar code