diff --git a/Jenkinsfile b/Jenkinsfile
index 4bba2c04b12..d3b411cda12 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,6 @@
 def nativeBuildAgent(String platform, Closure body) {
 	def final nativeBuildStageName = 'Build SWT-native binaries'
-	if(platform == 'gtk.linux.x86_64') {
+	if (platform == 'gtk.linux.x86_64') {
 		return podTemplate(yaml: '''
 apiVersion: v1
 kind: Pod
@@ -59,7 +59,7 @@ pipeline {
 	stages {
 		stage('Checkout swt git repos') {
 			steps {
-				dir ('eclipse.platform.swt') {
+				dir('eclipse.platform.swt') {
 					checkout scm
 					script {
 						def authorMail = sh(script: 'git log -1 --pretty=format:"%ce" HEAD', returnStdout: true)
@@ -75,7 +75,7 @@ pipeline {
 						git remote set-url --push origin git@github.com:eclipse-platform/eclipse.platform.swt.git
 					'''
 				}
-				dir ('eclipse.platform.swt.binaries') {
+				dir('eclipse.platform.swt.binaries') {
 					checkout([$class: 'GitSCM', branches: [[name: 'refs/heads/master']],
 						extensions: [[$class: 'CloneOption', timeout: 120, noTags: false ]],
 						userRemoteConfigs: [[url: 'https://github.com/eclipse-platform/eclipse.platform.swt.binaries.git']]
@@ -102,7 +102,7 @@ pipeline {
 			when {
 				anyOf {
 					expression { return params.forceNativeBuilds }
-					expression { return fileExists ('tmp/build_changed.txt') && fileExists ('tmp/natives_changed.txt') }
+					expression { return fileExists('tmp/build_changed.txt') && fileExists('tmp/natives_changed.txt') }
 				}
 			}
 			matrix {
@@ -151,7 +151,7 @@ pipeline {
 									}
 									// TODO: don't zip the sources and just (un)stash them unzipped! That safes the unzipping and removal of the the zip
 									withEnv(['MODEL=' + arch, "OUTPUT_DIR=${WORKSPACE}/libs", "SWT_JAVA_HOME=${WORKSPACE}/jdk.resources"]) {
-										if(isUnix()){
+										if (isUnix()){
 											sh '''
 												unzip -aa org.eclipse.swt.${PLATFORM}.master.zip
 												rm org.eclipse.swt.${PLATFORM}.master.zip
@@ -239,7 +239,7 @@ pipeline {
 		}
 		stage('Commit SWT-native binaries, if build') {
 			when {
-				expression { return params.forceNativeBuilds || fileExists ('tmp/build_changed.txt') }
+				expression { return params.forceNativeBuilds || fileExists('tmp/build_changed.txt') }
 			}
 			steps {
 				withAnt(installation: 'apache-ant-latest', jdk: 'openjdk-jdk11-latest') { // nashorn javascript-engine required in ant-scripts
@@ -276,14 +276,14 @@ pipeline {
 			}
 			steps {
 				xvnc(useXauthority: true) {
-					dir ('eclipse.platform.swt.binaries') {
+					dir('eclipse.platform.swt.binaries') {
 						sh '''
 							mvn install \
 								--batch-mode -Pbuild-individual-bundles -DforceContextQualifier=zzz \
 								-Dcompare-version-with-baselines.skip=true -Dmaven.compiler.failOnWarning=true
 						'''
 					}
-					dir ('eclipse.platform.swt') {
+					dir('eclipse.platform.swt') {
 						sh '''
 							mvn clean verify \
 								--batch-mode -DforkCount=0 \
@@ -304,13 +304,13 @@ pipeline {
 		}
 		stage('Push SWT-native binaries, if build') {
 			when {
-				expression { return params.forceNativeBuilds || fileExists ('tmp/build_changed.txt') }
+				expression { return params.forceNativeBuilds || fileExists('tmp/build_changed.txt') }
 			}
 			steps {
 				sshagent(['github-bot-ssh']) {
 					script {
 						def newSWTNativesTag = null;
-						dir ('eclipse.platform.swt.binaries') {
+						dir('eclipse.platform.swt.binaries') {
 							newSWTNativesTag = sh(script: 'git describe --abbrev=0 --tags --match v[0-9][0-9][0-9][0-9]*', returnStdout: true).strip()
 						}
 						echo "newSWTNativesTag: ${newSWTNativesTag}"
diff --git a/bundles/org.eclipse.swt/.externalToolBuilders/SWT Classpath Builder.launch b/bundles/org.eclipse.swt/.externalToolBuilders/SWT Classpath Builder.launch
deleted file mode 100644
index 8e49914f398..00000000000
--- a/bundles/org.eclipse.swt/.externalToolBuilders/SWT Classpath Builder.launch	
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="setup.classpath,"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="auto,"/>
-<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;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; label=&quot;working set&quot; name=&quot;working set&quot;&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.swt&quot; type=&quot;4&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.swt/build.xml}"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-</launchConfiguration>
diff --git a/bundles/org.eclipse.swt/build.xml b/bundles/org.eclipse.swt/build.xml
deleted file mode 100644
index 5d4dbc386e2..00000000000
--- a/bundles/org.eclipse.swt/build.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Copyright (c) 2009 IBM Corporation and others.
-
-    This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License 2.0
-    which accompanies this distribution, and is available at
-    https://www.eclipse.org/legal/epl-2.0/
-
-    SPDX-License-Identifier: EPL-2.0
-
-    Contributors:
-        IBM Corporation - initial API and implementation
- -->
-
-<project name="org.eclipse.swt" default="build.update.jar" basedir=".">
-
-	<target name="init">
-		<property name="plugin" value="org.eclipse.swt" />
-		<property name="version.suffix" value="3.123.100" />
-		<property name="full.name" value="${plugin}_${version.suffix}" />
-		<property name="temp.folder" value="${basedir}/temp.folder" />
-		<property name="plugin.destination" value="${basedir}" />
-		<property name="build.result.folder" value="${basedir}" />
-		<condition property="p2.publish.parts" value="true">
-			<istrue value="${p2.gathering}" />
-		</condition>
-	</target>
-
-	<target name="build.update.jar" depends="init">
-		<delete dir="${temp.folder}" />
-		<mkdir dir="${temp.folder}" />
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/" />
-		</antcall>
-		<zip zipfile="${plugin.destination}/${full.name}.jar" basedir="${temp.folder}/${full.name}" filesonly="false" />
-		<delete dir="${temp.folder}" />
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts">
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${build.result.folder}" />
-		</antcall>
-		<eclipse.gatherBundle metadataRepository="${p2.build.repo}" artifactRepository="${p2.build.repo}" buildResultFolder="${build.result.folder}" targetFolder="${build.result.folder}/${full.name}" />
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/${full.name}" />
-		<copy todir="${destination.temp.folder}/${full.name}">
-			<fileset dir="${basedir}" includes="plugin.properties,about.html,about_files/,META-INF/" />
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/${full.name}" version="${version.suffix}" />
-	</target>
-
-	<target name="build.jars" />
-	<target name="gather.sources" />
-	<target name="build.sources" />
-	<target name="gather.logs" />
-
-	<target name="copy.classpath" unless="haveclasspath">
-		<copy file=".classpath_${osgi.ws}" tofile=".classpath" />
-		<eclipse.refreshLocal resource="." depth="infinite" />
-	</target>
-
-	<target name="setup.classpath">
-		<available file=".classpath" property="haveclasspath" />
-		<antcall target="copy.classpath" />
-		<copy file=".project_normal" tofile=".project" overwrite="yes" />
-	</target>
-
-	<target name="clean" depends="init">
-	</target>
-</project>
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/buildFragment.xml b/bundles/org.eclipse.swt/buildFragment.xml
index 10c559c7927..b88c40b1fcc 100644
--- a/bundles/org.eclipse.swt/buildFragment.xml
+++ b/bundles/org.eclipse.swt/buildFragment.xml
@@ -15,12 +15,11 @@
 
 <project name="org.eclipse.swt.fragment" default="" basedir=".">
 
-	<target name="init" depends="properties">
+	<target name="init">
 		<property name="compilerArg" value="" />
 		<condition property="fragment" value="org.eclipse.swt.${swt.ws}.${swt.os}.${swt.arch}" else="org.eclipse.swt.${swt.ws}.${swt.os}">
 			<isset property="swt.arch"/>
 		</condition>
-		<property name="full.name" value="${fragment}_${version.suffix}" />
 		<property name="fragmentdir" value="${basedir}" />
 		<property name="temp.folder" value="${fragmentdir}/temp.folder" />
 		<property name="plugin.destination" value="${fragmentdir}" />
@@ -35,21 +34,6 @@
 		<mkdir dir="target"/>
 	</target>
 
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
-	</target>
-
-	<target name="build.update.jar" depends="init">
-		<delete dir="${temp.folder}" />
-		<mkdir dir="${temp.folder}" />
-		<antcall target="build.jars" />
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/" />
-		</antcall>
-		<zip zipfile="${plugin.destination}/${full.name}.jar" basedir="${temp.folder}/${full.name}" filesonly="false" />
-		<delete dir="${temp.folder}" />
-	</target>
-
 	<target name="@dot" depends="init" unless="@dot" description="Create jar: @dot.">
 		<property name="destdir" value="${temp.folder}/@dot.bin" />
 		<property name="debug" value="true" />
@@ -79,7 +63,6 @@
 				<attribute name="SWT-OS" value="${swt.os}"/>
 				<attribute name="SWT-WS" value="${swt.ws}"/>
 				<attribute name="SWT-Arch" value="${arch}"/>
-				<attribute name="Implementation-Version" value="${version.suffix}"/>
 				<attribute name="Eclipse-Version" value="${eclipse.version}"/>
 			</manifest>
 		</jar>
@@ -104,18 +87,6 @@
 		<delete dir="${temp.folder}/@dot.src"/>
 	</target>
 
-	<target name="copy.src" depends="init">
-		<antcall target="copy.${swt.ws}.src"/>
-		<copy todir="${destination.temp.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="${temp.folder}/@dot.src" includes="**/*.java"/>
-			<fileset dir="${temp.folder}/@dot.src" includes="**/*.properties"/>
-			<fileset dir="${temp.folder}/@dot.src/library/"/>
-			<fileset dir="${temp.folder}/@dot.src" includes="**/version.txt"/>
-			<fileset dir="${fragmentdir}" includes="about.html,about_files/"/>
-		</copy>
-		<delete dir="${temp.folder}/@dot.src"/>
-	</target>
-
 	<target name="copy.cocoa.src">
 		<property name="copy.src.dir" value="${temp.folder}/@dot.src"/>
 		<delete dir="${copy.src.dir}" quiet="true"/>
@@ -222,48 +193,6 @@
 		<antcall target="src.zip" />
 	</target>
 
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/${full.name}" />
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/${full.name}/" />
-		<copy todir="${destination.temp.folder}/${full.name}">
-			<fileset dir="${fragmentdir}" includes="about.html,about_files/" />
-		</copy>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src" />
-		<copy todir="${destination.temp.folder}">
-			<fileset dir="${fragmentdir}" includes="about.html,about_files/" />
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/${full.name}" />
-		<copy file="${temp.folder}/@dot.bin${logExtension}" todir="${destination.temp.folder}/${full.name}/" />
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts">
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${build.result.folder}" />
-		</antcall>
-		<eclipse.gatherBundle metadataRepository="${p2.build.repo}" artifactRepository="${p2.build.repo}" buildResultFolder="${build.result.folder}" targetFolder="${build.result.folder}/${full.name}" />
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/${full.name}" />
-		<copy todir="${destination.temp.folder}/${full.name}" failonerror="true">
-			<fileset dir="${build.result.folder}/@dot" includes="**" />
-		</copy>
-		<copy todir="${destination.temp.folder}/${full.name}">
-			<fileset dir="${fragmentdir}" includes="fragment.properties,about.html,about_files/,swt*.dll,libswt*.so,libswt*.sl,libswt*.a,libswt*.jnilib,libXm.so.2,META-INF/,WebView2Loader.dll" />
-		</copy>
-		<chmod perm="755" dir="${destination.temp.folder}/${full.name}" includes="swt*.dll,libswt*.so,libswt*.sl,libswt*.a,libswt*.jnilib,libXm.so.2,WebView2Loader.dll" />
-		<eclipse.versionReplacer path="${destination.temp.folder}/${full.name}" version="${version.suffix}" />
-	</target>
-
 	<target name="swtdownload" depends="init">
 		<delete dir="${temp.folder}" />
 		<delete dir="${build.result.folder}/@dot" />
@@ -290,53 +219,4 @@
 		<delete dir="${temp.folder}" />
 	</target>
 
-	<target name="clean" depends="init">
-		<delete dir="${build.result.folder}/@dot" />
-		<delete file="${build.result.folder}/src.zip" />
-		<delete file="${plugin.destination}/${full.name}.jar" />
-		<delete file="${plugin.destination}/${full.name}.zip" />
-		<delete dir="${temp.folder}" />
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running">
-		<eclipse.refreshLocal resource="${fragment}" depth="infinite" />
-	</target>
-
-	<target name="zip.plugin" depends="init">
-		<delete dir="${temp.folder}" />
-		<mkdir dir="${temp.folder}" />
-		<antcall target="build.jars" />
-		<antcall target="build.sources" />
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/" />
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/" />
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}" includes="**/*.bin.xml" />
-		</delete>
-		<zip zipfile="${plugin.destination}/${full.name}.zip" basedir="${temp.folder}" filesonly="true" />
-		<delete dir="${temp.folder}" />
-	</target>
-
-	<target name="jar.plugin" depends="init">
-		<delete dir="${temp.folder}" />
-		<mkdir dir="${temp.folder}" />
-		<antcall target="build.jars" />
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/" />
-		</antcall>
-		<condition property="arch" value="${swt.arch}" else="">
-			<isset property="swt.arch"/>
-		</condition>
-		<jar jarfile="${plugin.destination}/${full.name}.jar" basedir="${temp.folder}/${full.name}" filesonly="true" manifest="${fragmentdir}/META-INF/MANIFEST.MF">
-			<manifest>
-				<attribute name="SWT-OS" value="${swt.os}"/>
-				<attribute name="SWT-WS" value="${swt.ws}"/>
-				<attribute name="SWT-Arch" value="${arch}"/>
-			</manifest>
-		</jar>
-		<delete dir="${temp.folder}" />
-	</target>
 </project>
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml
index a83a9674428..046ddb9ddb4 100644
--- a/bundles/org.eclipse.swt/buildSWT.xml
+++ b/bundles/org.eclipse.swt/buildSWT.xml
@@ -31,7 +31,6 @@
 
 <project name="swtbuild" basedir=".">
 	
-	<property name="gitroot" value="git@github.com:eclipse-platform/"/>
 	<property name="TAG" value="master"/>
 	<property name="tmphome" value="../../../tmp"/>
 
@@ -48,42 +47,8 @@
 	<property name="file_src_pom" value="bundles/org.eclipse.swt/pom.xml"/>
 	<property name="file_bin_parent_pom" value="bundles/binaries-parent/pom.xml"/>
 	
-	<target name="init_keyfile">
-		<condition property="keyfile" value="C:\BUILD\ssh\swtbuild_dsa_private" else="/var/lib/hudson/.ssh/id_rsa">
-			<os family="windows"/>
-		</condition>
-	</target>
-
-	<target name="check_libraries" depends="get_version">
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="3"/>
-			<param name="fragment" value="org.eclipse.swt.cocoa.macosx.aarch64"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="3"/>
-			<param name="fragment" value="org.eclipse.swt.cocoa.macosx.x86_64"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="7"/>
-			<param name="fragment" value="org.eclipse.swt.gtk.linux.aarch64"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="7"/>
-			<param name="fragment" value="org.eclipse.swt.gtk.linux.ppc64le"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="7"/>
-			<param name="fragment" value="org.eclipse.swt.gtk.linux.x86_64"/>
-		</antcall>
-		<antcall target="check_fragment_libraries">
-			<param name="library_count" value="4"/>
-			<param name="fragment" value="org.eclipse.swt.win32.win32.x86_64"/>
-		</antcall>
-	</target>
-
 	<target name="check_fragment_libraries" depends="get_version">
 		<echo>Checking ${fragment}</echo>
-		<property name="checkdir" value="~/build/check_libraries"/>
 		<property name="library_count" value="31"/>
 		<property name="fragment" value=""/>
 		<fileset id="match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.aarch64/**, **/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.aarch64/**, **/org.eclipse.swt.cocoa.macosx.x86_64/**">
@@ -114,79 +79,6 @@
 		<echo>Success</echo>
 	</target>
 
-	<target name="check_machines" depends="init_keyfile">
-		<parallel>
-		<sshexec host="${m_linux_x86_64}"
-			username="swtbuild"
-			keyfile="${keyfile}"
-			failonerror="false"
-			trust="true"
-			outputproperty="m_linux_x86_64_output"
-			command="hostname"/>
-		<sshexec host="${m_linux_ppc64le}"
-			port="2256"
-			username="swtbuild"
-			keyfile="${keyfile}"
-			failonerror="false"
-			trust="true"
-			outputproperty="m_linux_ppc64le_output"
-			command="hostname"/>
-		<sshexec host="${m_linux_aarch64}"
-			port="2256"
-			username="swtbuild"
-			keyfile="${keyfile}"
-			failonerror="false"
-			trust="true"
-			outputproperty="m_linux_aarch64_output"
-			command="hostname"/>
-		<sshexec host="${m_mac}"
-			username="swtbuild"
-			keyfile="${keyfile}"
-			failonerror="false"
-			trust="true"
-			outputproperty="m_mac_output"
-			command="hostname"/>
-		</parallel>
-		<property name="success_msg" value="Success"/>
-		<property name="fail_msg" value="*** Fail ***"/>
-		<condition property="m_linux_x86_64_test" value="${success_msg}" else="${fail_msg}">
-			<and>
-				<length string="${m_linux_x86_64_output}" when="greater" length="0"/>
-				<matches pattern="x${m_linux_x86_64_output}*" string="x${m_linux_x86_64}"/>
-			</and>
-		</condition>
-		<condition property="m_linux_ppc64le_test" value="${success_msg}" else="${fail_msg}">
-			<and>
-				<length string="${m_linux_ppc64le_output}" when="greater" length="0"/>
-				<matches pattern="x${m_linux_ppc64le_output}*" string="x${m_linux_ppc64le}"/>
-			</and>
-		</condition>
-		<condition property="m_linux_aarch64_test" value="${success_msg}" else="${fail_msg}">
-			<and>
-				<length string="${m_linux_aarch64_output}" when="greater" length="0"/>
-				<matches pattern="x${m_linux_aarch64_output}*" string="x${m_linux_aarch64}"/>
-			</and>
-		</condition>
-		<condition property="m_mac_test" value="${success_msg}" else="${fail_msg}">
-			<and>
-				<length string="${m_mac_output}" when="greater" length="0"/>
-				<matches pattern="x${m_mac_output}*" string="x${m_mac}"/>
-			</and>
-		</condition>
-		<echo>-------------------------</echo>
-		<echo>Status:</echo>
-		<echo></echo>
-		<echo>${m_linux_x86_64} - ${m_linux_x86_64_test}</echo>
-		<echo>${m_linux_ppc64le} - ${m_linux_ppc64le_test}</echo>
-		<echo>${m_linux_aarch64} - ${m_linux_aarch64_test}</echo>
-		<echo>${m_mac} - ${m_mac_test}</echo>
-		<echo>-------------------------</echo>
-		<condition property="m_fail">
-			<matches pattern="Fail" string="${m_linux_x86_64_test} ${m_linux_ppc64le_test} ${m_linux_aarch64_test} ${m_mac_test}"/>
-		</condition>
-		<fail if="m_fail" message="Failed"/>
-	</target>
-
 	<target name="check_preprocessing">
 		<property name="projectDir" value="${repo.src}/bundles/org.eclipse.swt"/>
 		<fileset id="badfilesid" dir="${projectDir}" includes="**/*.java" excludes="**/.build64/**/*.java">
@@ -206,11 +98,6 @@
 	</target>
 
 	<!-- common build tasks -->
-	<target name="new_release">
-		<property name="natives_changed" value="true"/>
-		<property name="increment_version_target" value="increment_release_version"/>
-		<antcall target="new_build"/>
-	</target>
 
 	<target name="check_build_changed" depends="get_tag" unless="build_changed">
 		<!-- Check for changes -->
@@ -229,15 +116,6 @@
 		<echo>Has build changes: ${build_changed} checked against ${swt_tag}</echo>
 	</target>
 
-	<target name="new_build" depends="check_build_changed, check_natives_changed" if="build_changed">
-		<!-- Update the version files -->
-		<property name="increment_version_target" value="increment_version"/>
-		<antcall target="${increment_version_target}"/>
-
-		<!-- Commit the files -->
-		<antcall target="commit_sources"/>
-	</target>
-
 	<target name="commit_sources" depends="get_version" if="natives_changed">
 		<exec dir="${repo.src}" executable="git" failonerror="true">
 			<arg line="add '${file_library}' '${file_version}' '${file_make_common}' "/>
@@ -251,14 +129,6 @@
 	</target>
 	
 	<target name="increment_version" depends="get_version" if="natives_changed">
-		<antcall target="increment_version_impl"/>
-	</target>
-
-	<target name="increment_release_version" depends="get_new_release_version" if="natives_changed">
-		<antcall target="increment_version_impl"/>
-	</target>
-
-	<target name="increment_version_impl">
 		<echo>Incrementing version from ${swt_version} to ${new_version}...</echo>
 		<replace file="${repo.src}/${file_library}" token="MAJOR_VERSION = ${maj_ver}" value="MAJOR_VERSION = ${new_maj_ver}"/>
 		<replace file="${repo.src}/${file_library}" token="MINOR_VERSION = ${min_ver}" value="MINOR_VERSION = ${new_min_ver}"/>
@@ -342,64 +212,6 @@
 		<echo>Version=${swt_version}; New=${new_version}; New comma_ver=${new_comma_ver}</echo>
 	</target>
 
-	<target name="get_new_release_version" unless="min_ver">
-		<loadproperties srcFile="${repo.src}/${file_make_common}"/>
-		<script language="javascript">
-		<![CDATA[
-			rev = project.getProperty("rev");
-			min_ver = project.getProperty("min_ver");
-			maj_ver = project.getProperty("maj_ver");
-			new_rev = 1;
-			new_min_ver = parseInt(min_ver) + 2;
-			new_maj_ver = maj_ver;
-			if (new_min_ver >= 1000) {
-				new_min_ver = "000";
-				new_maj_ver = parseInt(new_maj_ver) + 1;
-			}
-			one = new_maj_ver;
-			two = new_min_ver;
-			three = new_rev;
-			four = 0;
-			project.setProperty("new_rev", new_rev);
-			project.setProperty("new_min_ver", new_min_ver);
-			project.setProperty("new_maj_ver", new_maj_ver);
-			project.setProperty("new_comma_ver", one + "," + two + "," + three + "," + four);
-   	 	]]>
-		</script>
-		<property name="swt_version" value="${maj_ver}${min_ver}r${rev}"/>
-		<property name="new_version" value="${new_maj_ver}${new_min_ver}r${new_rev}"/>
-		<echo>Version=${swt_version}; New=${new_version}; New comma_ver=${new_comma_ver}</echo>
-	</target>
-	
-	<target name="get_new_maintenance_release_version" unless="min_ver">
-			<loadproperties srcFile="${repo.src}/${file_make_common}"/>
-			<script language="javascript">
-			<![CDATA[
-				rev = project.getProperty("rev");
-				min_ver = project.getProperty("min_ver");
-				maj_ver = project.getProperty("maj_ver");
-				new_rev = 1;
-				new_min_ver = parseInt(min_ver) + 1;
-				new_maj_ver = maj_ver;
-				if (new_min_ver >= 1000) {
-					new_min_ver = "000";
-					new_maj_ver = parseInt(new_maj_ver) + 1;
-				}
-				one = new_maj_ver;
-				two = new_min_ver;
-				three = new_rev;
-				four = 0;
-				project.setProperty("new_rev", new_rev);
-				project.setProperty("new_min_ver", new_min_ver);
-				project.setProperty("new_maj_ver", new_maj_ver);
-				project.setProperty("new_comma_ver", one + "," + two + "," + three + "," + four);
-	   	 	]]>
-			</script>
-			<property name="swt_version" value="${maj_ver}${min_ver}r${rev}"/>
-			<property name="new_version" value="${new_maj_ver}${new_min_ver}r${new_rev}"/>
-			<echo>Version=${swt_version}; New=${new_version}; New comma_ver=${new_comma_ver}</echo>
-		</target>
-
 	<!-- Set natives_changed if there are changes in the C code -->
 	<target name="check_natives_changed" unless="natives_changed" depends="get_tag">
 		<exec dir="${repo.src}" executable="git" failonerror="true" outputproperty="diffs">
@@ -416,8 +228,6 @@
 
 	<!-- depends on 'get_new_tag' to define swt_new_tag, swt_version, maj_ver and min_ver -->
 	<target name="tag_projects" depends="get_new_tag">
-		<!-- These two lines perform the same check. check_libraries is slower because it checks each fragment separetely  -->
-		<!--antcall target="check_libraries"/-->
 		<antcall target="check_fragment_libraries"/>
 
 		<exec dir="${repo.src}" executable="git" failonerror="true">
@@ -583,7 +393,7 @@
 	</target>
 
 	<!-- Params: swt.ws, swt.os, swt.arch -->
-	<target name="build_libraries" depends="init_fragment,init_keyfile,get_version">
+	<target name="build_libraries" depends="init_fragment,get_version">
 		<property name="swt.arch" value=""/>
 		<property name="clean" value="clean"/>
 		<property name="targets" value="install"/>
@@ -592,77 +402,18 @@
 		<property name="build_dir" value="${basedir}/${fragment_dir}/tmpdir"/>
 		<delete dir="${build_dir}" quiet="true"/>
 		<antcall target="copy.library.src"/>
-		<condition property="build_task" value="build_local_win">
-			<and>
-				<not>
-					<isset property="machine"/>
-				</not>
-				<or>
-					<equals arg1="${swt.ws}" arg2="win32"/>
-				</or>
-			</and>
-		</condition>
-		<condition property="build_task" value="build_remote" else="build_local">
-			<isset property="machine"/>
-		</condition>
-		<condition property="port" value="22">
-			<not>
-				<isset property="port"/>
-			</not>
+		<condition property="build_task" value="build_local_win" else="build_local">
+			<equals arg1="${swt.ws}" arg2="win32"/>
 		</condition>
 		<antcall target="init_build"/>
 		<antcall target="${build_task}">
 			<param name="build_targets" value="${targets}"/>
 			<param name="build_machine" value="${machine}"/>
-			<param name="port" value="${port}"/>
-			<param name="keyfile" value="${keyfile}"/>
 		</antcall>
 		<delete dir="${build_dir}" quiet="true"/>
 		<antcall target="refresh_fragment"/>
 	</target>
 
-	<target name="build_remote" depends="init_keyfile">
-		<property name="libs" value="*"/>
-		<property name="exports" value=""/>
-
-		<condition property="remotebuilddir" value="c:/build" else="~/build/">
-			<equals arg1="${swt.os}" arg2="win32"/>
-		</condition>
-		<condition property="exit_cmd" value="exit;" else="">
-			<equals arg1="${swt.os}" arg2="win32"/>
-		</condition>
-		<condition property="build_cmd" value="unix2dos *; if cmd /c build.bat ${build_targets};" else="if sh build.sh ${build_targets};">
-			<equals arg1="${swt.os}" arg2="win32"/>
-		</condition>
-
-		<property name="remotetmpdir" value="${remotebuilddir}/${fragment}.${TAG}"/>
-		<property name="lib_output" value="${remotetmpdir}/libs"/>
-		<property name="zip_file" value="${fragment}.${TAG}.zip"/>
-		<zip destfile="${build_dir}/${zip_file}" basedir="${build_dir}" excludes="${zip_file}"/>
-		<scp file="${build_dir}/${zip_file}"
-			todir="swtbuild@${build_machine}:${remotebuilddir}"
-			port="${port}"
-			keyfile="${keyfile}"
-			trust="true"/>
-		<sshexec host="${build_machine}"
-			username="swtbuild"
-			port="${port}"
-			keyfile="${keyfile}"
-			trust="true"
-	 		command="rm -rf ${remotetmpdir}; mkdir ${remotetmpdir}; mkdir ${lib_output}; cd ${remotetmpdir}; unzip -aa ${remotebuilddir}/${zip_file}; ${exports} export MODEL=${swt.arch}; export OUTPUT_DIR=${lib_output}; ${build_cmd} then ${exit_cmd} cd; else ${exit_cmd} cd; rm -rf ${remotetmpdir}; rm ${remotebuilddir}/${zip_file}; exit 1; fi"/>
-		<scp file="swtbuild@${build_machine}:${lib_output}/${libs}"
-			todir="${output_dir}"
-			port="${port}"
-			keyfile="${keyfile}"
-			trust="true"/>
-		<sshexec host="${build_machine}"
-			username="swtbuild"
-			port="${port}"
-			keyfile="${keyfile}"
-			trust="true"
-	 		command="rm -rf ${remotetmpdir}; rm ${remotebuilddir}/${zip_file}"/>
-	</target>
-
 	<target name="build_local">
 		<property name="gtk_version" value="3.0" />
 		<property name="SWT_JAVA_HOME" value="${java.home}"/><!-- Not overwritten if already set, e.g. as CLI argument -->
@@ -692,142 +443,13 @@
 		</exec>
 	</target>
 
-	<target name="check_repo">
-		<echo>Check ${repo}</echo>
-		 <condition property="${repo.exists}">
-		 	<available file="../../../../${TAG}/${repo}" type="dir"/>
-		 </condition>
-	</target>
-
-	<target name="init_repo" depends="check_repo" unless="${repo.exists}" >
-		<delete dir="../../../../${TAG}/${repo}" quiet="true"/>
-		<mkdir dir="../../../../${TAG}"/>
-		<exec dir="../../../../${TAG}" executable="git" failonerror="true">
-			<arg line="clone ${gitroot}/${repo}"/>
-		</exec>
-		<condition property="perform.checkout">
-			<not>
-				<equals arg1="${checkout_tag}" arg2="master"/>
-			</not>
-		</condition>
-		<antcall target="checkout_repo"/>
-	</target>
-
-	<target name="checkout_repo" if="perform.checkout">
-		<echo>Checking out ${repo}=${checkout_tag}</echo>
-		<exec dir="../../../../${TAG}/${repo}" executable="git" failonerror="true">
-			<arg line="checkout -b ${checkout_tag} origin/${checkout_tag}"/>
-		</exec>
-	</target>
-
-	<target name="pull_remote">
-		<antcall target="init_repo">
-			<param name="repo" value="eclipse.platform.swt"/>
-			<param name="repo.exists" value="repo.src.exists"/>
-			<param name="checkout_tag" value="${TAG}"/>
-		</antcall>
-		<exec dir="../../../../${TAG}/eclipse.platform.swt" executable="git"  failonerror="true" timeout="900000">
-			<arg line="fetch"/>
-		</exec>
-		<exec dir="../../../../${TAG}/eclipse.platform.swt" executable="git"  failonerror="true" timeout="900000">
-			<arg line="reset --hard origin/${TAG}"/>
-		</exec>
-		<exec dir="../../../../${TAG}/eclipse.platform.swt" executable="git"  failonerror="true" timeout="900000">
-			<arg line="clean -fd"/>
-		</exec>
-		<antcall target="init_repo">
-			<param name="repo" value="eclipse.platform.swt.binaries"/>
-			<param name="repo.exists" value="repo.bin.exists"/>
-			<param name="checkout_tag" value="${TAG}"/>
-		</antcall>
-		<exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true" timeout="900000">
-			<arg line="fetch"/>
-		</exec>
-		<exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true" timeout="900000">
-			<arg line="reset --hard origin/${TAG}"/>
-		</exec>
-		<exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true" timeout="900000">
-			<arg line="clean -fd"/>
-		</exec>
-	</target>
-
-	<target name="push_remote" depends="get_tag">
-		<exec dir="../../../../${TAG}/eclipse.platform.swt" executable="git" failonerror="true">
-			<arg line="fetch"/>
-		</exec>
-		<exec dir="../../../../${TAG}/eclipse.platform.swt" executable="git" failonerror="true">
-			<arg line="rebase origin/${TAG}"/>
-		</exec>
-		<exec dir="../../../../${TAG}/eclipse.platform.swt" executable="git" failonerror="true">
-			<arg line="push origin ${TAG}"/>
-		</exec>
-		<exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true">
-			<arg line="fetch"/>
-		</exec>
-		<exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true">
-			<arg line="rebase origin/${TAG}"/>
-		</exec>
-		<exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true">
-			<arg line="push origin ${TAG}"/>
-		</exec>
-		<exec dir="${repo.src}" executable="git" failonerror="true">
-			<arg line="push origin refs/tags/${swt_tag}"/>
-		</exec>
-		<exec dir="${repo.bin}" executable="git" failonerror="true">
-			<arg line="push origin refs/tags/${swt_tag}"/>
-		</exec>
-	</target>
-
-	<target name="push_integration">
-		<property name="TAG" value="master"/>
-		<!-- src -->
-		<exec dir="../../../../${TAG}/eclipse.platform.swt" executable="git" failonerror="true">
-			<arg line="checkout master"/>
-		</exec>
-		<exec dir="../../../../${TAG}/eclipse.platform.swt" executable="git" failonerror="true">
-			<arg line="reset --hard origin/${TAG}"/>
-		</exec>
-		<exec dir="../../../../${TAG}/eclipse.platform.swt" executable="git" failonerror="true">
-			<arg line="checkout integration"/>
-		</exec>
-		<exec dir="../../../../${TAG}/eclipse.platform.swt" executable="git" failonerror="true">
-			<arg line="merge master"/>
-		</exec>
-		<exec dir="../../../../${TAG}/eclipse.platform.swt" executable="git" failonerror="true">
-			<arg line="push origin integration"/>
-		</exec>
-		<exec dir="../../../../${TAG}/eclipse.platform.swt" executable="git" failonerror="true">
-			<arg line="checkout master"/>
-		</exec>
-		<!-- bin -->
-		<exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true">
-			<arg line="checkout master"/>
-		</exec>
-		<exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true">
-			<arg line="reset --hard origin/${TAG}"/>
-		</exec>
-		<exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true">
-			<arg line="checkout integration"/>
-		</exec>
-		<exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true">
-			<arg line="merge master"/>
-		</exec>
-		<exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true">
-			<arg line="push origin integration"/>
-		</exec>
-		<exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true">
-			<arg line="checkout master"/>
-		</exec>
-	</target>
-	
 	<!-- ******************************************************************************** -->
 	<!-- targets to run the builds on the Eclipse Foundation Hudson in master-slave setup -->
 	<!-- ******************************************************************************** -->
 	
 	<target name="new_build_with_create_file" depends="check_build_changed, check_natives_changed" if="build_changed">
 		<!-- Update the version files -->
-		<property name="increment_version_target" value="increment_version"/>
-		<antcall target="${increment_version_target}"/>
+		<antcall target="increment_version"/>
 
 		<!-- Commit the files -->
 		<antcall target="commit_sources"/>
@@ -863,63 +485,5 @@
 		<!-- create a zip of the native source files to be sent to the build machine -->
 		<zip destfile="${build_dir}/${zip_file}" basedir="${build_dir}" excludes="${zip_file}"/>
 	</target>
-	
-	<target name="build_libraries_slave" depends="init_fragment">
-		<property name="swt.arch" value=""/>
-		<property name="clean" value="clean"/>
-		<property name="targets" value="install"/>
-		<property name="libs" value="*"/>
-		<property name="src_zip_file" value="${fragment}.${TAG}.zip"/>
-		<property name="lib_zip_file" value="${fragment}.${TAG}.zip"/>
-		
-		<condition property="remotebuilddir" value="c:/build" else="build/">
-			<equals arg1="${swt.os}" arg2="win32"/>
-		</condition>	
-		<property name="remotetmpdir" value="${remotebuilddir}/${fragment}.${TAG}"/>
-		<property name="lib_output" value="${remotetmpdir}/libs"/>
-		<condition property="build_task" value="build_win_slave" else="build_remote_slave">
-			<equals arg1="${swt.ws}" arg2="win32"/>
-		</condition>
-			
-		<!-- This target doesn't copy the src zip, it expects that the zip file is already be copied to remotebuilddir -->
-		
-		<echo>${remotebuilddir}</echo>
-		<delete dir="${remotetmpdir}" quiet="false"/>
-		<mkdir dir="${remotetmpdir}"/>
-		<mkdir dir="${lib_output}"/>
-		<unzip src="${remotebuilddir}/${src_zip_file}" dest="${remotetmpdir}"/>
-		<delete file="${remotebuilddir}/${zip_file}"/>
-			
-		<antcall target="${build_task}">
-			<param name="build_targets" value="${targets}"/>
-		</antcall>
-		
-		<antcall target="build_gtk3"/>
-		
-		<zip destfile="${remotetmpdir}/${lib_zip_file}" basedir="${lib_output}" excludes="${zip_file}" compress="false"/>
-	</target>
-		
-	<target name="build_win_slave">
-		<echo>${remotetmpdir}</echo>
-		<pathconvert property="win_output_dir">
-			<path location="${lib_output}"></path>
-		</pathconvert>
-		<exec dir="${remotetmpdir}" executable="${remotetempdir}/build.bat" failonerror="true">
-			<env key="OUTPUT_DIR" value="${win_output_dir}"/>
-			<arg line="${build_targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-	</target>
-		
-	<target name="build_remote_slave">
-		<echo>${remotetmpdir}</echo>
-		<exec dir="${remotetmpdir}" executable="sh" failonerror="true">
-			<arg line="build.sh"/>
-			<env key="GTK_VERSION" value="${gtk_version}"/>
-			<env key="MODEL" value="${swt.arch}"/>
-			<env key="OUTPUT_DIR" value="${lib_output}"/>
-			<arg line="${build_targets}"/>
-			<arg line="${clean}"/>
-		</exec>
-	</target>
+
 </project>