First pass at dropdown cleanup