- Remove "TransportSet" hack and a not more needed expansion support check