Removed finished TODOs / cleaned up ComboBox