diff --git a/drivers/corsa/src/main/java/org/onosproject/drivers/corsa/CorsaFullVlanAvailable.java b/drivers/corsa/src/main/java/org/onosproject/drivers/corsa/CorsaFullVlanAvailable.java
deleted file mode 100644
index a7e9b8c8d5..0000000000
--- a/drivers/corsa/src/main/java/org/onosproject/drivers/corsa/CorsaFullVlanAvailable.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2016-present Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onosproject.drivers.corsa;
-
-import com.google.common.annotations.Beta;
-import org.onosproject.driver.query.FullVlanAvailable;
-
-/**
- * Driver which always responds that all VLAN IDs are available for the Device.
- *
- * FIXME
- * To avoid CorsaFullVlanAvailable.
- *
- * OSGi: help bundle plugin discover runtime package dependency.
- * <pre>
- * <code>
- *  Remember to add the tag: SuppressWarnings("unused")
- *  private FullVlanAvailable fullVlans;
- * </code>
- * </pre>
- */
-
-
-@Beta
-public class CorsaFullVlanAvailable extends FullVlanAvailable {
-
-}
diff --git a/drivers/corsa/src/main/resources/corsa-drivers.xml b/drivers/corsa/src/main/resources/corsa-drivers.xml
index 4aa54ad10d..57dcf8eca9 100644
--- a/drivers/corsa/src/main/resources/corsa-drivers.xml
+++ b/drivers/corsa/src/main/resources/corsa-drivers.xml
@@ -48,6 +48,6 @@
         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
                    impl="org.onosproject.drivers.corsa.CorsaSwitchHandshaker"/>
         <behaviour api="org.onosproject.net.behaviour.VlanQuery"
-                   impl="org.onosproject.drivers.corsa.CorsaFullVlanAvailable"/>
+                   impl="org.onosproject.driver.query.FullVlanAvailable"/>
     </driver>
 </drivers>
\ No newline at end of file