Remove cruft from pretty_print
Add tool for removing need for TrafficInjection backwards compatibility