more dropdown cleanup