Delete unnecessary macros
Moved endpoint parsing out of parse_trafgen_option - now called in parse_flow_option