diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.xml b/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.xml
index 1d18dfd6003..7c9c4a61d2c 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.xml
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.xml
@@ -30,51 +30,33 @@
             id="org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.genericDevice"
             name="%Generic.name">
       </device>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.debug.gdbjtag.core.JTagDevice">
       <device
             class="org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.AbatronBDI2000"
             id="org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.AbatronBDI2000"
             name="%AbatronBDI2000.name">
       </device>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.debug.gdbjtag.core.JTagDevice">
       <device
             class="org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.MacraigorUsb2Demon"
             id="org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.MacraigorUsb2Demon"
             name="%MacraigorUsb2Demon.name">
       </device>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.debug.gdbjtag.core.JTagDevice">
       <device
             class="org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.DefaultGDBJtagConnectionImpl"
             default_connection="/dev/com1"
             id="org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.GenericSerial"
             name="%GenericSerial.name">
       </device>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.debug.gdbjtag.core.JTagDevice">
       <device
             class="org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.OpenOCDPipe"
             default_connection="| openocd --pipe"
             id="org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.OpenOCD"
             name="%OpenOCDPipe.name">
       </device>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.debug.gdbjtag.core.JTagDevice">
       <device
             class="org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.OpenOCDSocket"
             id="org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.OpenOCDSocket"
             name="%OpenOCDSocket.name">
       </device>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.debug.gdbjtag.core.JTagDevice">
       <device
             class="org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.SeggerJLink"
             id="org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.SeggerJLink"