diff --git a/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/build.xml
index 4009fa178..edebdf318 100644
--- a/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/build.xml
@@ -45,7 +45,4 @@
         <fileset dir="doc" includes="**/*.xml" />
       </delete>
     </target>
-    <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-      <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-    </target>
 </project>
diff --git a/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/plugin.xml b/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/plugin.xml
index 43800d9f4..823639981 100644
--- a/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/plugin.xml
+++ b/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/plugin.xml
@@ -6,8 +6,5 @@
       <toc
             file="doc/User-Guide-toc.xml"
             primary="true" />
-      <index
-            path="index/">
-      </index>
    </extension>
 </plugin>
diff --git a/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/pom.xml b/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/pom.xml
index 3f2ec6a15..5e504ec5b 100644
--- a/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/pom.xml
+++ b/doc/org.eclipse.tracecompass.incubator.atrace.doc.user/pom.xml
@@ -57,32 +57,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Build help index -->
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-eclipserun-plugin</artifactId>
-        <configuration>
-          <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build.xml build.index</appArgLine>
-        </configuration>
-      </plugin>
-      <!-- We don't use the ant file to clean because of http://jira.codehaus.org/browse/MANTRUN-78 -->
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean-index</id>
-            <phase>clean</phase>
-            <configuration>
-              <filesets>
-                <fileset><directory>index/</directory></fileset>
-              </filesets>
-            </configuration>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/build.xml
index bf67631a4..96f600160 100644
--- a/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/build.xml
@@ -45,7 +45,4 @@
         <fileset dir="doc" includes="**/*.xml" />
       </delete>
     </target>
-    <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-      <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-    </target>
 </project>
diff --git a/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/plugin.xml b/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/plugin.xml
index 43800d9f4..823639981 100644
--- a/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/plugin.xml
+++ b/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/plugin.xml
@@ -6,8 +6,5 @@
       <toc
             file="doc/User-Guide-toc.xml"
             primary="true" />
-      <index
-            path="index/">
-      </index>
    </extension>
 </plugin>
diff --git a/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/pom.xml b/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/pom.xml
index e8d0fea6c..298df80f6 100644
--- a/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/pom.xml
+++ b/doc/org.eclipse.tracecompass.incubator.eventfieldcount.doc.user/pom.xml
@@ -57,32 +57,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Build help index -->
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-eclipserun-plugin</artifactId>
-        <configuration>
-          <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build.xml build.index</appArgLine>
-        </configuration>
-      </plugin>
-      <!-- We don't use the ant file to clean because of http://jira.codehaus.org/browse/MANTRUN-78 -->
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean-index</id>
-            <phase>clean</phase>
-            <configuration>
-              <filesets>
-                <fileset><directory>index/</directory></fileset>
-              </filesets>
-            </configuration>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/doc/org.eclipse.tracecompass.incubator.executioncomparison.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.executioncomparison.doc.user/build.xml
index 4b59ace9d..f6142d50d 100644
--- a/doc/org.eclipse.tracecompass.incubator.executioncomparison.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.executioncomparison.doc.user/build.xml
@@ -45,7 +45,4 @@
         <fileset dir="doc" includes="**/*.xml" />
       </delete>
     </target>
-    <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-      <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-    </target>
 </project>
diff --git a/doc/org.eclipse.tracecompass.incubator.executioncomparison.doc.user/plugin.xml b/doc/org.eclipse.tracecompass.incubator.executioncomparison.doc.user/plugin.xml
index 43800d9f4..823639981 100644
--- a/doc/org.eclipse.tracecompass.incubator.executioncomparison.doc.user/plugin.xml
+++ b/doc/org.eclipse.tracecompass.incubator.executioncomparison.doc.user/plugin.xml
@@ -6,8 +6,5 @@
       <toc
             file="doc/User-Guide-toc.xml"
             primary="true" />
-      <index
-            path="index/">
-      </index>
    </extension>
 </plugin>
diff --git a/doc/org.eclipse.tracecompass.incubator.executioncomparison.doc.user/pom.xml b/doc/org.eclipse.tracecompass.incubator.executioncomparison.doc.user/pom.xml
index b3b1896fa..69f5f375d 100644
--- a/doc/org.eclipse.tracecompass.incubator.executioncomparison.doc.user/pom.xml
+++ b/doc/org.eclipse.tracecompass.incubator.executioncomparison.doc.user/pom.xml
@@ -57,32 +57,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Build help index -->
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-eclipserun-plugin</artifactId>
-        <configuration>
-          <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build.xml build.index</appArgLine>
-        </configuration>
-      </plugin>
-      <!-- We don't use the ant file to clean because of http://jira.codehaus.org/browse/MANTRUN-78 -->
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean-index</id>
-            <phase>clean</phase>
-            <configuration>
-              <filesets>
-                <fileset><directory>index/</directory></fileset>
-              </filesets>
-            </configuration>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/doc/org.eclipse.tracecompass.incubator.filters.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.filters.doc.user/build.xml
index 63b5a1d06..ec6d783f9 100644
--- a/doc/org.eclipse.tracecompass.incubator.filters.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.filters.doc.user/build.xml
@@ -45,7 +45,4 @@
         <fileset dir="doc" includes="**/*.xml" />
       </delete>
     </target>
-    <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-      <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-    </target>
 </project>
diff --git a/doc/org.eclipse.tracecompass.incubator.filters.doc.user/plugin.xml b/doc/org.eclipse.tracecompass.incubator.filters.doc.user/plugin.xml
index 43800d9f4..823639981 100644
--- a/doc/org.eclipse.tracecompass.incubator.filters.doc.user/plugin.xml
+++ b/doc/org.eclipse.tracecompass.incubator.filters.doc.user/plugin.xml
@@ -6,8 +6,5 @@
       <toc
             file="doc/User-Guide-toc.xml"
             primary="true" />
-      <index
-            path="index/">
-      </index>
    </extension>
 </plugin>
diff --git a/doc/org.eclipse.tracecompass.incubator.filters.doc.user/pom.xml b/doc/org.eclipse.tracecompass.incubator.filters.doc.user/pom.xml
index 1881708ab..b68e2e932 100644
--- a/doc/org.eclipse.tracecompass.incubator.filters.doc.user/pom.xml
+++ b/doc/org.eclipse.tracecompass.incubator.filters.doc.user/pom.xml
@@ -57,32 +57,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Build help index -->
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-eclipserun-plugin</artifactId>
-        <configuration>
-          <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build.xml build.index</appArgLine>
-        </configuration>
-      </plugin>
-      <!-- We don't use the ant file to clean because of http://jira.codehaus.org/browse/MANTRUN-78 -->
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean-index</id>
-            <phase>clean</phase>
-            <configuration>
-              <filesets>
-                <fileset><directory>index/</directory></fileset>
-              </filesets>
-            </configuration>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/build.xml
index 4496cff97..e9cd961d5 100644
--- a/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/build.xml
@@ -45,7 +45,4 @@
         <fileset dir="doc" includes="**/*.xml" />
       </delete>
     </target>
-    <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-      <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-    </target>
 </project>
diff --git a/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/plugin.xml b/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/plugin.xml
index 43800d9f4..823639981 100644
--- a/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/plugin.xml
+++ b/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/plugin.xml
@@ -6,8 +6,5 @@
       <toc
             file="doc/User-Guide-toc.xml"
             primary="true" />
-      <index
-            path="index/">
-      </index>
    </extension>
 </plugin>
diff --git a/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/pom.xml b/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/pom.xml
index a54c93ffe..92e75e9e4 100644
--- a/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/pom.xml
+++ b/doc/org.eclipse.tracecompass.incubator.ftrace.doc.user/pom.xml
@@ -57,32 +57,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Build help index -->
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-eclipserun-plugin</artifactId>
-        <configuration>
-          <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build.xml build.index</appArgLine>
-        </configuration>
-      </plugin>
-      <!-- We don't use the ant file to clean because of http://jira.codehaus.org/browse/MANTRUN-78 -->
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean-index</id>
-            <phase>clean</phase>
-            <configuration>
-              <filesets>
-                <fileset><directory>index/</directory></fileset>
-              </filesets>
-            </configuration>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/doc/org.eclipse.tracecompass.incubator.gerrit.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.gerrit.doc.user/build.xml
index cbd152728..c8e078eea 100644
--- a/doc/org.eclipse.tracecompass.incubator.gerrit.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.gerrit.doc.user/build.xml
@@ -45,7 +45,4 @@
         <fileset dir="doc" includes="**/*.xml" />
       </delete>
     </target>
-    <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-      <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-    </target>
 </project>
diff --git a/doc/org.eclipse.tracecompass.incubator.gerrit.doc.user/plugin.xml b/doc/org.eclipse.tracecompass.incubator.gerrit.doc.user/plugin.xml
index 43800d9f4..823639981 100644
--- a/doc/org.eclipse.tracecompass.incubator.gerrit.doc.user/plugin.xml
+++ b/doc/org.eclipse.tracecompass.incubator.gerrit.doc.user/plugin.xml
@@ -6,8 +6,5 @@
       <toc
             file="doc/User-Guide-toc.xml"
             primary="true" />
-      <index
-            path="index/">
-      </index>
    </extension>
 </plugin>
diff --git a/doc/org.eclipse.tracecompass.incubator.gerrit.doc.user/pom.xml b/doc/org.eclipse.tracecompass.incubator.gerrit.doc.user/pom.xml
index 7413e4c4b..46a293a3b 100644
--- a/doc/org.eclipse.tracecompass.incubator.gerrit.doc.user/pom.xml
+++ b/doc/org.eclipse.tracecompass.incubator.gerrit.doc.user/pom.xml
@@ -57,32 +57,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Build help index -->
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-eclipserun-plugin</artifactId>
-        <configuration>
-          <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build.xml build.index</appArgLine>
-        </configuration>
-      </plugin>
-      <!-- We don't use the ant file to clean because of http://jira.codehaus.org/browse/MANTRUN-78 -->
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean-index</id>
-            <phase>clean</phase>
-            <configuration>
-              <filesets>
-                <fileset><directory>index/</directory></fileset>
-              </filesets>
-            </configuration>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/doc/org.eclipse.tracecompass.incubator.gpu.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.gpu.doc.user/build.xml
index 6e0dbc625..5d5811504 100644
--- a/doc/org.eclipse.tracecompass.incubator.gpu.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.gpu.doc.user/build.xml
@@ -45,7 +45,4 @@
         <fileset dir="doc" includes="**/*.xml" />
       </delete>
     </target>
-    <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-      <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-    </target>
 </project>
diff --git a/doc/org.eclipse.tracecompass.incubator.gpu.doc.user/plugin.xml b/doc/org.eclipse.tracecompass.incubator.gpu.doc.user/plugin.xml
index 43800d9f4..823639981 100644
--- a/doc/org.eclipse.tracecompass.incubator.gpu.doc.user/plugin.xml
+++ b/doc/org.eclipse.tracecompass.incubator.gpu.doc.user/plugin.xml
@@ -6,8 +6,5 @@
       <toc
             file="doc/User-Guide-toc.xml"
             primary="true" />
-      <index
-            path="index/">
-      </index>
    </extension>
 </plugin>
diff --git a/doc/org.eclipse.tracecompass.incubator.gpu.doc.user/pom.xml b/doc/org.eclipse.tracecompass.incubator.gpu.doc.user/pom.xml
index a1a2af1c2..0aff34d12 100644
--- a/doc/org.eclipse.tracecompass.incubator.gpu.doc.user/pom.xml
+++ b/doc/org.eclipse.tracecompass.incubator.gpu.doc.user/pom.xml
@@ -57,32 +57,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Build help index -->
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-eclipserun-plugin</artifactId>
-        <configuration>
-          <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build.xml build.index</appArgLine>
-        </configuration>
-      </plugin>
-      <!-- We don't use the ant file to clean because of http://jira.codehaus.org/browse/MANTRUN-78 -->
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean-index</id>
-            <phase>clean</phase>
-            <configuration>
-              <filesets>
-                <fileset><directory>index/</directory></fileset>
-              </filesets>
-            </configuration>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/doc/org.eclipse.tracecompass.incubator.inandout.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch b/doc/org.eclipse.tracecompass.incubator.inandout.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch
index 3750e81b3..01dda4cc0 100644
--- a/doc/org.eclipse.tracecompass.incubator.inandout.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch	
+++ b/doc/org.eclipse.tracecompass.incubator.inandout.doc.user/.externalToolBuilders/Trace Compass Incubator User Guide Builder.launch	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
 <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="build,build.index,"/>
+<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="build,"/>
 <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
 <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
 <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.tracecompass.tmf.pcap.doc.user&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
diff --git a/doc/org.eclipse.tracecompass.incubator.inandout.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.inandout.doc.user/build.xml
index 81e0b8f88..9c498a5a5 100644
--- a/doc/org.eclipse.tracecompass.incubator.inandout.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.inandout.doc.user/build.xml
@@ -45,7 +45,4 @@
         <fileset dir="doc" includes="**/*.xml" />
       </delete>
     </target>
-    <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-      <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-    </target>
 </project>
diff --git a/doc/org.eclipse.tracecompass.incubator.inandout.doc.user/plugin.xml b/doc/org.eclipse.tracecompass.incubator.inandout.doc.user/plugin.xml
index 43800d9f4..823639981 100644
--- a/doc/org.eclipse.tracecompass.incubator.inandout.doc.user/plugin.xml
+++ b/doc/org.eclipse.tracecompass.incubator.inandout.doc.user/plugin.xml
@@ -6,8 +6,5 @@
       <toc
             file="doc/User-Guide-toc.xml"
             primary="true" />
-      <index
-            path="index/">
-      </index>
    </extension>
 </plugin>
diff --git a/doc/org.eclipse.tracecompass.incubator.inandout.doc.user/pom.xml b/doc/org.eclipse.tracecompass.incubator.inandout.doc.user/pom.xml
index 96fefb27f..3f1d7ad22 100644
--- a/doc/org.eclipse.tracecompass.incubator.inandout.doc.user/pom.xml
+++ b/doc/org.eclipse.tracecompass.incubator.inandout.doc.user/pom.xml
@@ -57,32 +57,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Build help index -->
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-eclipserun-plugin</artifactId>
-        <configuration>
-          <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build.xml build.index</appArgLine>
-        </configuration>
-      </plugin>
-      <!-- We don't use the ant file to clean because of http://jira.codehaus.org/browse/MANTRUN-78 -->
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean-index</id>
-            <phase>clean</phase>
-            <configuration>
-              <filesets>
-                <fileset><directory>index/</directory></fileset>
-              </filesets>
-            </configuration>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/build.xml
index 6d5371f5b..ba9268a69 100644
--- a/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/build.xml
@@ -45,7 +45,4 @@
         <fileset dir="doc" includes="**/*.xml" />
       </delete>
     </target>
-    <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-      <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-    </target>
 </project>
diff --git a/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/plugin.xml b/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/plugin.xml
index 43800d9f4..823639981 100644
--- a/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/plugin.xml
+++ b/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/plugin.xml
@@ -6,8 +6,5 @@
       <toc
             file="doc/User-Guide-toc.xml"
             primary="true" />
-      <index
-            path="index/">
-      </index>
    </extension>
 </plugin>
diff --git a/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/pom.xml b/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/pom.xml
index 1cd7ee7e6..f5b32025f 100644
--- a/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/pom.xml
+++ b/doc/org.eclipse.tracecompass.incubator.kernel.doc.user/pom.xml
@@ -57,32 +57,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Build help index -->
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-eclipserun-plugin</artifactId>
-        <configuration>
-          <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build.xml build.index</appArgLine>
-        </configuration>
-      </plugin>
-      <!-- We don't use the ant file to clean because of http://jira.codehaus.org/browse/MANTRUN-78 -->
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean-index</id>
-            <phase>clean</phase>
-            <configuration>
-              <filesets>
-                <fileset><directory>index/</directory></fileset>
-              </filesets>
-            </configuration>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/build.xml
index 53a530192..0202ff50c 100644
--- a/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/build.xml
@@ -45,7 +45,4 @@
         <fileset dir="doc" includes="**/*.xml" />
       </delete>
     </target>
-    <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-      <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-    </target>
 </project>
diff --git a/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/plugin.xml b/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/plugin.xml
index 43800d9f4..823639981 100644
--- a/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/plugin.xml
+++ b/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/plugin.xml
@@ -6,8 +6,5 @@
       <toc
             file="doc/User-Guide-toc.xml"
             primary="true" />
-      <index
-            path="index/">
-      </index>
    </extension>
 </plugin>
diff --git a/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/pom.xml b/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/pom.xml
index 33cc1508a..672436259 100644
--- a/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/pom.xml
+++ b/doc/org.eclipse.tracecompass.incubator.lttng2.ust.extras.doc.user/pom.xml
@@ -57,32 +57,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Build help index -->
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-eclipserun-plugin</artifactId>
-        <configuration>
-          <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build.xml build.index</appArgLine>
-        </configuration>
-      </plugin>
-      <!-- We don't use the ant file to clean because of http://jira.codehaus.org/browse/MANTRUN-78 -->
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean-index</id>
-            <phase>clean</phase>
-            <configuration>
-              <filesets>
-                <fileset><directory>index/</directory></fileset>
-              </filesets>
-            </configuration>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/build.xml
index f0a030fde..cef0bafd8 100644
--- a/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/build.xml
@@ -45,7 +45,4 @@
         <fileset dir="doc" includes="**/*.xml" />
       </delete>
     </target>
-    <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-      <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-    </target>
 </project>
diff --git a/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/plugin.xml b/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/plugin.xml
index 43800d9f4..823639981 100644
--- a/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/plugin.xml
+++ b/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/plugin.xml
@@ -6,8 +6,5 @@
       <toc
             file="doc/User-Guide-toc.xml"
             primary="true" />
-      <index
-            path="index/">
-      </index>
    </extension>
 </plugin>
diff --git a/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/pom.xml b/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/pom.xml
index 7c42d3cef..2bd8bfe4a 100644
--- a/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/pom.xml
+++ b/doc/org.eclipse.tracecompass.incubator.opentracing.doc.user/pom.xml
@@ -57,32 +57,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Build help index -->
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-eclipserun-plugin</artifactId>
-        <configuration>
-          <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build.xml build.index</appArgLine>
-        </configuration>
-      </plugin>
-      <!-- We don't use the ant file to clean because of http://jira.codehaus.org/browse/MANTRUN-78 -->
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean-index</id>
-            <phase>clean</phase>
-            <configuration>
-              <filesets>
-                <fileset><directory>index/</directory></fileset>
-              </filesets>
-            </configuration>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/doc/org.eclipse.tracecompass.incubator.otf2.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.otf2.doc.user/build.xml
index 2006dea04..a6b181ad8 100644
--- a/doc/org.eclipse.tracecompass.incubator.otf2.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.otf2.doc.user/build.xml
@@ -45,7 +45,4 @@
         <fileset dir="doc" includes="**/*.xml" />
       </delete>
     </target>
-    <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-      <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-    </target>
 </project>
diff --git a/doc/org.eclipse.tracecompass.incubator.otf2.doc.user/plugin.xml b/doc/org.eclipse.tracecompass.incubator.otf2.doc.user/plugin.xml
index 43800d9f4..823639981 100644
--- a/doc/org.eclipse.tracecompass.incubator.otf2.doc.user/plugin.xml
+++ b/doc/org.eclipse.tracecompass.incubator.otf2.doc.user/plugin.xml
@@ -6,8 +6,5 @@
       <toc
             file="doc/User-Guide-toc.xml"
             primary="true" />
-      <index
-            path="index/">
-      </index>
    </extension>
 </plugin>
diff --git a/doc/org.eclipse.tracecompass.incubator.otf2.doc.user/pom.xml b/doc/org.eclipse.tracecompass.incubator.otf2.doc.user/pom.xml
index 63d1d6fef..17a827c73 100644
--- a/doc/org.eclipse.tracecompass.incubator.otf2.doc.user/pom.xml
+++ b/doc/org.eclipse.tracecompass.incubator.otf2.doc.user/pom.xml
@@ -57,32 +57,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Build help index -->
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-eclipserun-plugin</artifactId>
-        <configuration>
-          <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build.xml build.index</appArgLine>
-        </configuration>
-      </plugin>
-      <!-- We don't use the ant file to clean because of http://jira.codehaus.org/browse/MANTRUN-78 -->
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean-index</id>
-            <phase>clean</phase>
-            <configuration>
-              <filesets>
-                <fileset><directory>index/</directory></fileset>
-              </filesets>
-            </configuration>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/build.xml
index 0d8bf1035..5addc7b6a 100644
--- a/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/build.xml
@@ -45,7 +45,4 @@
         <fileset dir="doc" includes="**/*.xml" />
       </delete>
     </target>
-    <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-      <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-    </target>
 </project>
diff --git a/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/plugin.xml b/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/plugin.xml
index 43800d9f4..823639981 100644
--- a/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/plugin.xml
+++ b/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/plugin.xml
@@ -6,8 +6,5 @@
       <toc
             file="doc/User-Guide-toc.xml"
             primary="true" />
-      <index
-            path="index/">
-      </index>
    </extension>
 </plugin>
diff --git a/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/pom.xml b/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/pom.xml
index a7e244ba5..eb0cbc7ca 100644
--- a/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/pom.xml
+++ b/doc/org.eclipse.tracecompass.incubator.perf.profiling.doc.user/pom.xml
@@ -57,32 +57,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Build help index -->
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-eclipserun-plugin</artifactId>
-        <configuration>
-          <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build.xml build.index</appArgLine>
-        </configuration>
-      </plugin>
-      <!-- We don't use the ant file to clean because of http://jira.codehaus.org/browse/MANTRUN-78 -->
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean-index</id>
-            <phase>clean</phase>
-            <configuration>
-              <filesets>
-                <fileset><directory>index/</directory></fileset>
-              </filesets>
-            </configuration>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/doc/org.eclipse.tracecompass.incubator.ros.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.ros.doc.user/build.xml
index 42becc61d..f14baacc3 100644
--- a/doc/org.eclipse.tracecompass.incubator.ros.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.ros.doc.user/build.xml
@@ -45,7 +45,4 @@
         <fileset dir="doc" includes="**/*.xml" />
       </delete>
     </target>
-    <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-      <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-    </target>
 </project>
diff --git a/doc/org.eclipse.tracecompass.incubator.ros.doc.user/plugin.xml b/doc/org.eclipse.tracecompass.incubator.ros.doc.user/plugin.xml
index 43800d9f4..823639981 100644
--- a/doc/org.eclipse.tracecompass.incubator.ros.doc.user/plugin.xml
+++ b/doc/org.eclipse.tracecompass.incubator.ros.doc.user/plugin.xml
@@ -6,8 +6,5 @@
       <toc
             file="doc/User-Guide-toc.xml"
             primary="true" />
-      <index
-            path="index/">
-      </index>
    </extension>
 </plugin>
diff --git a/doc/org.eclipse.tracecompass.incubator.ros.doc.user/pom.xml b/doc/org.eclipse.tracecompass.incubator.ros.doc.user/pom.xml
index d570bdd20..b655a3521 100644
--- a/doc/org.eclipse.tracecompass.incubator.ros.doc.user/pom.xml
+++ b/doc/org.eclipse.tracecompass.incubator.ros.doc.user/pom.xml
@@ -57,32 +57,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Build help index -->
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-eclipserun-plugin</artifactId>
-        <configuration>
-          <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build.xml build.index</appArgLine>
-        </configuration>
-      </plugin>
-      <!-- We don't use the ant file to clean because of http://jira.codehaus.org/browse/MANTRUN-78 -->
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean-index</id>
-            <phase>clean</phase>
-            <configuration>
-              <filesets>
-                <fileset><directory>index/</directory></fileset>
-              </filesets>
-            </configuration>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/doc/org.eclipse.tracecompass.incubator.ros2.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.ros2.doc.user/build.xml
index d792ae419..91c9d0f5c 100644
--- a/doc/org.eclipse.tracecompass.incubator.ros2.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.ros2.doc.user/build.xml
@@ -45,7 +45,4 @@
         <fileset dir="doc" includes="**/*.xml" />
       </delete>
     </target>
-    <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-      <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-    </target>
 </project>
diff --git a/doc/org.eclipse.tracecompass.incubator.ros2.doc.user/plugin.xml b/doc/org.eclipse.tracecompass.incubator.ros2.doc.user/plugin.xml
index 43800d9f4..823639981 100644
--- a/doc/org.eclipse.tracecompass.incubator.ros2.doc.user/plugin.xml
+++ b/doc/org.eclipse.tracecompass.incubator.ros2.doc.user/plugin.xml
@@ -6,8 +6,5 @@
       <toc
             file="doc/User-Guide-toc.xml"
             primary="true" />
-      <index
-            path="index/">
-      </index>
    </extension>
 </plugin>
diff --git a/doc/org.eclipse.tracecompass.incubator.ros2.doc.user/pom.xml b/doc/org.eclipse.tracecompass.incubator.ros2.doc.user/pom.xml
index 725fa721a..ec379beca 100644
--- a/doc/org.eclipse.tracecompass.incubator.ros2.doc.user/pom.xml
+++ b/doc/org.eclipse.tracecompass.incubator.ros2.doc.user/pom.xml
@@ -57,32 +57,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Build help index -->
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-eclipserun-plugin</artifactId>
-        <configuration>
-          <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build.xml build.index</appArgLine>
-        </configuration>
-      </plugin>
-      <!-- We don't use the ant file to clean because of http://jira.codehaus.org/browse/MANTRUN-78 -->
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean-index</id>
-            <phase>clean</phase>
-            <configuration>
-              <filesets>
-                <fileset><directory>index/</directory></fileset>
-              </filesets>
-            </configuration>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/build.xml
index 6786e1aeb..8a507750f 100644
--- a/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/build.xml
@@ -45,7 +45,4 @@
         <fileset dir="doc" includes="**/*.xml" />
       </delete>
     </target>
-    <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-      <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-    </target>
 </project>
diff --git a/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/plugin.xml b/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/plugin.xml
index 43800d9f4..823639981 100644
--- a/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/plugin.xml
+++ b/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/plugin.xml
@@ -6,8 +6,5 @@
       <toc
             file="doc/User-Guide-toc.xml"
             primary="true" />
-      <index
-            path="index/">
-      </index>
    </extension>
 </plugin>
diff --git a/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/pom.xml b/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/pom.xml
index f3c8a8ffe..7e22b7078 100644
--- a/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/pom.xml
+++ b/doc/org.eclipse.tracecompass.incubator.scripting.doc.user/pom.xml
@@ -56,32 +56,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Build help index -->
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-eclipserun-plugin</artifactId>
-        <configuration>
-          <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build.xml build.index</appArgLine>
-        </configuration>
-      </plugin>
-      <!-- We don't use the ant file to clean because of http://jira.codehaus.org/browse/MANTRUN-78 -->
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean-index</id>
-            <phase>clean</phase>
-            <configuration>
-              <filesets>
-                <fileset><directory>index/</directory></fileset>
-              </filesets>
-            </configuration>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/doc/org.eclipse.tracecompass.incubator.system.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.system.doc.user/build.xml
index 6d9dbc059..cc6d0a988 100644
--- a/doc/org.eclipse.tracecompass.incubator.system.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.system.doc.user/build.xml
@@ -45,7 +45,4 @@
         <fileset dir="doc" includes="**/*.xml" />
       </delete>
     </target>
-    <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-      <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-    </target>
 </project>
diff --git a/doc/org.eclipse.tracecompass.incubator.system.doc.user/plugin.xml b/doc/org.eclipse.tracecompass.incubator.system.doc.user/plugin.xml
index 43800d9f4..823639981 100644
--- a/doc/org.eclipse.tracecompass.incubator.system.doc.user/plugin.xml
+++ b/doc/org.eclipse.tracecompass.incubator.system.doc.user/plugin.xml
@@ -6,8 +6,5 @@
       <toc
             file="doc/User-Guide-toc.xml"
             primary="true" />
-      <index
-            path="index/">
-      </index>
    </extension>
 </plugin>
diff --git a/doc/org.eclipse.tracecompass.incubator.system.doc.user/pom.xml b/doc/org.eclipse.tracecompass.incubator.system.doc.user/pom.xml
index 40ed2540b..bd73793ad 100644
--- a/doc/org.eclipse.tracecompass.incubator.system.doc.user/pom.xml
+++ b/doc/org.eclipse.tracecompass.incubator.system.doc.user/pom.xml
@@ -57,32 +57,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Build help index -->
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-eclipserun-plugin</artifactId>
-        <configuration>
-          <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build.xml build.index</appArgLine>
-        </configuration>
-      </plugin>
-      <!-- We don't use the ant file to clean because of http://jira.codehaus.org/browse/MANTRUN-78 -->
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean-index</id>
-            <phase>clean</phase>
-            <configuration>
-              <filesets>
-                <fileset><directory>index/</directory></fileset>
-              </filesets>
-            </configuration>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/build.xml b/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/build.xml
index c701d6c36..5cf3c2dea 100644
--- a/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/build.xml
@@ -45,7 +45,4 @@
         <fileset dir="doc" includes="**/*.xml" />
       </delete>
     </target>
-    <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-      <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-    </target>
 </project>
diff --git a/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/plugin.xml b/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/plugin.xml
index f7f9624e3..34d2d3c17 100644
--- a/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/plugin.xml
+++ b/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/plugin.xml
@@ -6,8 +6,5 @@
       <toc
             file="doc/Developer-Guide-toc.xml"
             primary="true" />
-      <index
-            path="index/">
-      </index>
    </extension>
 </plugin>
diff --git a/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/pom.xml b/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/pom.xml
index 2aab72d7a..42e317642 100644
--- a/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/pom.xml
+++ b/doc/org.eclipse.tracecompass.incubator.trace.server.doc.dev/pom.xml
@@ -57,32 +57,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Build help index -->
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-eclipserun-plugin</artifactId>
-        <configuration>
-          <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build.xml build.index</appArgLine>
-        </configuration>
-      </plugin>
-      <!-- We don't use the ant file to clean because of http://jira.codehaus.org/browse/MANTRUN-78 -->
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean-index</id>
-            <phase>clean</phase>
-            <configuration>
-              <filesets>
-                <fileset><directory>index/</directory></fileset>
-              </filesets>
-            </configuration>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/build.xml
index 73cceef88..a23edd234 100644
--- a/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/build.xml
@@ -45,7 +45,4 @@
         <fileset dir="doc" includes="**/*.xml" />
       </delete>
     </target>
-    <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-      <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-    </target>
 </project>
diff --git a/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/plugin.xml b/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/plugin.xml
index 43800d9f4..823639981 100644
--- a/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/plugin.xml
+++ b/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/plugin.xml
@@ -6,8 +6,5 @@
       <toc
             file="doc/User-Guide-toc.xml"
             primary="true" />
-      <index
-            path="index/">
-      </index>
    </extension>
 </plugin>
diff --git a/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/pom.xml b/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/pom.xml
index 03590ad21..438ee9fda 100644
--- a/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/pom.xml
+++ b/doc/org.eclipse.tracecompass.incubator.uftrace.doc.user/pom.xml
@@ -57,32 +57,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Build help index -->
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-eclipserun-plugin</artifactId>
-        <configuration>
-          <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build.xml build.index</appArgLine>
-        </configuration>
-      </plugin>
-      <!-- We don't use the ant file to clean because of http://jira.codehaus.org/browse/MANTRUN-78 -->
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean-index</id>
-            <phase>clean</phase>
-            <configuration>
-              <filesets>
-                <fileset><directory>index/</directory></fileset>
-              </filesets>
-            </configuration>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/build.xml b/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/build.xml
index 7f61404d2..0b5306ae5 100644
--- a/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/build.xml
+++ b/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/build.xml
@@ -45,7 +45,4 @@
         <fileset dir="doc" includes="**/*.xml" />
       </delete>
     </target>
-    <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-      <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-    </target>
 </project>
diff --git a/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/plugin.xml b/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/plugin.xml
index 43800d9f4..823639981 100644
--- a/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/plugin.xml
+++ b/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/plugin.xml
@@ -6,8 +6,5 @@
       <toc
             file="doc/User-Guide-toc.xml"
             primary="true" />
-      <index
-            path="index/">
-      </index>
    </extension>
 </plugin>
diff --git a/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/pom.xml b/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/pom.xml
index 4d6be7291..da37e2f41 100644
--- a/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/pom.xml
+++ b/doc/org.eclipse.tracecompass.incubator.virtual.machine.analysis.doc.user/pom.xml
@@ -57,32 +57,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Build help index -->
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-eclipserun-plugin</artifactId>
-        <configuration>
-          <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build.xml build.index</appArgLine>
-        </configuration>
-      </plugin>
-      <!-- We don't use the ant file to clean because of http://jira.codehaus.org/browse/MANTRUN-78 -->
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean-index</id>
-            <phase>clean</phase>
-            <configuration>
-              <filesets>
-                <fileset><directory>index/</directory></fileset>
-              </filesets>
-            </configuration>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/pom.xml b/pom.xml
index 4bb370475..c24ac0ed8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,6 @@
     <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tracecompass.incubator/org.eclipse.tracecompass.incubator.git</tycho.scmUrl>
     <cbi-plugins.version>1.4.2</cbi-plugins.version>
     <target-platform>tracecompass-incubator-master</target-platform>
-    <help-docs-eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.23</help-docs-eclipserun-repo>
 
     <rcptt-version>2.5.4</rcptt-version>
     <!-- Disable GTK3 because it's not quite usable yet and it can make the tests hang (bug in IcedTea http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1736) -->
@@ -659,44 +658,6 @@
           <version>2.3.0-SNAPSHOT</version>
         </plugin>
 
-        <plugin>
-          <groupId>org.eclipse.tycho.extras</groupId>
-          <artifactId>tycho-eclipserun-plugin</artifactId>
-          <version>${tycho-extras-version}</version>
-          <configuration>
-            <dependencies>
-              <dependency>
-                <artifactId>org.apache.ant</artifactId>
-                <type>eclipse-plugin</type>
-              </dependency>
-              <dependency>
-                <artifactId>org.eclipse.help.base</artifactId>
-                <type>eclipse-plugin</type>
-              </dependency>
-              <dependency>
-                <artifactId>org.eclipse.ant.core</artifactId>
-                <type>eclipse-plugin</type>
-              </dependency>
-            </dependencies>
-            <!-- This needs to be explicitely set now, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=395281 -->
-            <repositories>
-              <repository>
-                <id>platform</id>
-                <layout>p2</layout>
-                <url>${help-docs-eclipserun-repo}</url>
-              </repository>
-            </repositories>
-            <executionEnvironment>JavaSE-${jdk.version}</executionEnvironment>
-          </configuration>
-          <executions>
-            <execution>
-              <goals>
-                <goal>eclipse-run</goal>
-              </goals>
-              <phase>compile</phase>
-            </execution>
-          </executions>
-        </plugin>
         <plugin>
           <groupId>org.openapitools</groupId>
           <artifactId>openapi-generator-maven-plugin</artifactId>
diff --git a/skeleton/skeleton.doc.user/build.xml b/skeleton/skeleton.doc.user/build.xml
index 17649d680..3f98d22fc 100644
--- a/skeleton/skeleton.doc.user/build.xml
+++ b/skeleton/skeleton.doc.user/build.xml
@@ -45,7 +45,4 @@
         <fileset dir="doc" includes="**/*.xml" />
       </delete>
     </target>
-    <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-      <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-    </target>
 </project>
diff --git a/skeleton/skeleton.doc.user/plugin.xml b/skeleton/skeleton.doc.user/plugin.xml
index 43800d9f4..823639981 100644
--- a/skeleton/skeleton.doc.user/plugin.xml
+++ b/skeleton/skeleton.doc.user/plugin.xml
@@ -6,8 +6,5 @@
       <toc
             file="doc/User-Guide-toc.xml"
             primary="true" />
-      <index
-            path="index/">
-      </index>
    </extension>
 </plugin>
diff --git a/skeleton/skeleton.doc.user/pom.xml b/skeleton/skeleton.doc.user/pom.xml
index 19d55d8db..6b00914df 100644
--- a/skeleton/skeleton.doc.user/pom.xml
+++ b/skeleton/skeleton.doc.user/pom.xml
@@ -57,32 +57,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Build help index -->
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-eclipserun-plugin</artifactId>
-        <configuration>
-          <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build.xml build.index</appArgLine>
-        </configuration>
-      </plugin>
-      <!-- We don't use the ant file to clean because of http://jira.codehaus.org/browse/MANTRUN-78 -->
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>clean-index</id>
-            <phase>clean</phase>
-            <configuration>
-              <filesets>
-                <fileset><directory>index/</directory></fileset>
-              </filesets>
-            </configuration>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/skeleton/skeleton.rcp/skeleton.tracecompass.parent/pom.xml b/skeleton/skeleton.rcp/skeleton.tracecompass.parent/pom.xml
index 3d34b1dd8..3c5f04b59 100644
--- a/skeleton/skeleton.rcp/skeleton.tracecompass.parent/pom.xml
+++ b/skeleton/skeleton.rcp/skeleton.tracecompass.parent/pom.xml
@@ -33,7 +33,6 @@
     <target-platform>skeleton.tracecompass</target-platform>
     <jdk.version>11</jdk.version>
     <jdk.release>11</jdk.release>
-    <help-docs-eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.23</help-docs-eclipserun-repo>
     <sonar-version>3.9.0.2155</sonar-version>
     <jacoco-version>0.8.7</jacoco-version>
     <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
@@ -228,44 +227,6 @@
           <artifactId>sonar-maven-plugin</artifactId>
           <version>3.6.0.1398</version>
         </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho.extras</groupId>
-          <artifactId>tycho-eclipserun-plugin</artifactId>
-          <version>${tycho-extras-version}</version>
-          <configuration>
-            <dependencies>
-              <dependency>
-                <artifactId>org.apache.ant</artifactId>
-                <type>eclipse-plugin</type>
-              </dependency>
-              <dependency>
-                <artifactId>org.eclipse.help.base</artifactId>
-                <type>eclipse-plugin</type>
-              </dependency>
-              <dependency>
-                <artifactId>org.eclipse.ant.core</artifactId>
-                <type>eclipse-plugin</type>
-              </dependency>
-            </dependencies>
-            <!-- This needs to be explicitly set now, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=395281 -->
-            <repositories>
-              <repository>
-                <id>platform</id>
-                <layout>p2</layout>
-                <url>${help-docs-eclipserun-repo}</url>
-              </repository>
-            </repositories>
-            <executionEnvironment>JavaSE-11</executionEnvironment>
-          </configuration>
-          <executions>
-            <execution>
-              <goals>
-                <goal>eclipse-run</goal>
-              </goals>
-              <phase>compile</phase>
-            </execution>
-          </executions>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>