Improvements to the ComboBox Models and import cleanup