cpc_gtpu => clean-up