Removing some bad code from the fixed-ip driver, couple of small fixes.

Change-Id: If1c5ea6855350eca60c461d236e39692590d4395