Refactor CreateNetwork: change dataport names

Remov commented out code.