Remove some useless code from best_span