Fix UI issue with name's combo box.
Remove extra code.