removed more dhcp bogus code and fixed some comments