Clean up remaining references to trip planning.