Revert "ComboBox and ListBox"

This reverts commit 616315927bc35a0cfb5f83285096484d812458a0.