Fix for deleting trip with highlights + cleanup

Cleanup to externalize the higlightOverlappingTrip logic.
Also, a fix for deleting a trip to remove the highlights if necessary.