Some networking cleanup and new network ids.