Networking tweaks
Clean up unused and unassigned vars