Clean up transports by introducing base transport