More clean up for Network module and also old code is removed