Code review mark-ups
Remove extra tracing and fix up get_trail_id