Cleanup; use controlled <select>