2.x Remove duplication in transport