Added VLAN fields
Remove NACIP, and  references for VLAN
Remove debugging
Fix merge problems