ChoiceBoxSkin: code cleanup, removed unused/commented