Remove no-pick optimization