Some small cleanup.

Removing unused variables.
Speeding up sort_in_vor.