some cleanup in DropDown