Use new intersection code for segment trace.
Cleanup.