Some Network code cleanup.