diff --git a/drivers/barefoot/src/main/java/org/onosproject/drivers/barefoot/TofinoPipelineProgrammable.java b/drivers/barefoot/src/main/java/org/onosproject/drivers/barefoot/TofinoPipelineProgrammable.java
index a1dc789..9e4cf24 100644
--- a/drivers/barefoot/src/main/java/org/onosproject/drivers/barefoot/TofinoPipelineProgrammable.java
+++ b/drivers/barefoot/src/main/java/org/onosproject/drivers/barefoot/TofinoPipelineProgrammable.java
@@ -17,6 +17,7 @@
 package org.onosproject.drivers.barefoot;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import org.apache.commons.io.IOUtils;
 import org.apache.thrift.TException;
@@ -26,15 +27,24 @@
 import org.apache.thrift.transport.TSocket;
 import org.apache.thrift.transport.TTransport;
 import org.onlab.util.SharedExecutors;
+import org.onosproject.drivers.barefoot.pal.InvalidPalOperation;
 import org.onosproject.drivers.barefoot.pal.pal;
-import org.onosproject.drivers.barefoot.pal.pal_autoneg_policy_t;
 import org.onosproject.drivers.barefoot.pal.pal_fec_type_t;
 import org.onosproject.drivers.barefoot.pal.pal_port_speed_t;
 import org.onosproject.incubator.net.config.basics.PortDescriptionsConfig;
+import org.onosproject.net.AnnotationKeys;
+import org.onosproject.net.Device;
 import org.onosproject.net.DeviceId;
+import org.onosproject.net.Port;
 import org.onosproject.net.config.NetworkConfigService;
+import org.onosproject.net.config.basics.BasicDeviceConfig;
+import org.onosproject.net.device.DeviceDescription;
+import org.onosproject.net.device.DeviceDescriptionDiscovery;
+import org.onosproject.net.device.DeviceService;
 import org.onosproject.net.device.PortDescription;
 import org.onosproject.net.driver.AbstractHandlerBehaviour;
+import org.onosproject.net.driver.Driver;
+import org.onosproject.net.driver.DriverService;
 import org.onosproject.net.pi.model.PiPipeconf;
 import org.onosproject.net.pi.model.PiPipeconf.ExtensionType;
 import org.onosproject.net.pi.model.PiPipelineProgrammable;
@@ -43,12 +53,14 @@
 import org.onosproject.provider.general.device.api.GeneralProviderDeviceConfig;
 import org.slf4j.Logger;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -176,7 +188,6 @@
             pal.Client client = new pal.Client(mProtocol);
 
             client.pal_port_add(deviceId, dp, speed, pal_fec_type_t.BF_FEC_TYP_NONE);
-            client.pal_port_an_set(deviceId, dp, pal_autoneg_policy_t.BF_AN_FORCE_DISABLE);
             client.pal_port_enable(deviceId, dp);
             transport.close();
         } catch (TException x) {