- dropped choice optimization code, it does too much harm