diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7f19ff69..56a9603b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,12 @@
 {
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.checkstyle.configuration": "${workspaceFolder}/jdtls.ext/check_style.xml",
-    "java.checkstyle.version": "8.29"
+    "java.checkstyle.version": "8.29",
+    "java.import.exclusions": [
+        "**/test/**",
+        "**/node_modules/**",
+        "**/.metadata/**",
+        "**/archetype-resources/**",
+        "**/META-INF/maven/**",
+    ]
 }
diff --git a/javaConfig.json b/javaConfig.json
index ac6a9020..5544d609 100644
--- a/javaConfig.json
+++ b/javaConfig.json
@@ -1,7 +1,6 @@
 {
     "projects": [
-        "./jdtls.ext/com.microsoft.jdtls.ext.core",
-        "./jdtls.ext/com.microsoft.jdtls.ext.activator"
+        "./jdtls.ext/com.microsoft.jdtls.ext.core"
     ],
    "targetPlatform": "./jdtls.ext/target.target"
 }
diff --git a/jdtls.ext/com.microsoft.jdtls.ext.activator/META-INF/MANIFEST.MF b/jdtls.ext/com.microsoft.jdtls.ext.activator/META-INF/MANIFEST.MF
deleted file mode 100644
index f25ad223..00000000
--- a/jdtls.ext/com.microsoft.jdtls.ext.activator/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: JDTLS EXT Activator
-Bundle-SymbolicName: com.microsoft.jdtls.ext.activator;singleton:=true
-Bundle-Version: 0.21.0
-Bundle-Activator: com.microsoft.jdtls.ext.activator.JdtlsExtActivator
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.jdt.core,
- org.osgi.framework;version="1.3.0"
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jdt.ls.core
-Bundle-ClassPath: .
diff --git a/jdtls.ext/com.microsoft.jdtls.ext.activator/build.properties b/jdtls.ext/com.microsoft.jdtls.ext.activator/build.properties
deleted file mode 100644
index e9863e28..00000000
--- a/jdtls.ext/com.microsoft.jdtls.ext.activator/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml
diff --git a/jdtls.ext/com.microsoft.jdtls.ext.activator/plugin.xml b/jdtls.ext/com.microsoft.jdtls.ext.activator/plugin.xml
deleted file mode 100644
index 5535690d..00000000
--- a/jdtls.ext/com.microsoft.jdtls.ext.activator/plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-</plugin>
diff --git a/jdtls.ext/com.microsoft.jdtls.ext.activator/pom.xml b/jdtls.ext/com.microsoft.jdtls.ext.activator/pom.xml
deleted file mode 100644
index d134a6a8..00000000
--- a/jdtls.ext/com.microsoft.jdtls.ext.activator/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.microsoft.jdtls.ext</groupId>
-        <artifactId>jdtls-ext-parent</artifactId>
-        <version>0.21.0</version>
-    </parent>
-    <artifactId>com.microsoft.jdtls.ext.activator</artifactId>
-    <packaging>eclipse-plugin</packaging>
-    <name>${base.name} :: JDTLS Ext Activator Plugin</name>
-    <properties>
-    </properties>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>tycho-maven-plugin</artifactId>
-                <version>${tycho-version}</version>
-                <extensions>true</extensions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/jdtls.ext/com.microsoft.jdtls.ext.activator/src/com/microsoft/jdtls/ext/activator/JdtlsExtActivator.java b/jdtls.ext/com.microsoft.jdtls.ext.activator/src/com/microsoft/jdtls/ext/activator/JdtlsExtActivator.java
deleted file mode 100644
index 57e3c27b..00000000
--- a/jdtls.ext/com.microsoft.jdtls.ext.activator/src/com/microsoft/jdtls/ext/activator/JdtlsExtActivator.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2020 Microsoft Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Microsoft Corporation - initial API and implementation
- *******************************************************************************/
-
-package com.microsoft.jdtls.ext.activator;
-
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.IJobChangeListener;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.jdt.ls.core.internal.JavaClientConnection;
-import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class JdtlsExtActivator implements BundleActivator {
-
-    private static final String INITIALIZE_WORKSPACE_JOB_NAME = "Initialize workspace";
-    private static final String JAVA_PROJECT_ACTIVATE_COMMAND = "java.project.activate";
-
-    private static IJobChangeListener jobChangeListener = new JobChangeAdapter() {
-        @Override
-        public void done(IJobChangeEvent event) {
-            if (!event.getJob().getName().contains(INITIALIZE_WORKSPACE_JOB_NAME)) {
-                return;
-            }
-
-            JavaClientConnection connection = JavaLanguageServerPlugin.getInstance().getClientConnection();
-            connection.executeClientCommand(JAVA_PROJECT_ACTIVATE_COMMAND);
-        }
-    };
-
-    @Override
-    public void start(BundleContext bundleContext) throws Exception {
-        Job.getJobManager().addJobChangeListener(jobChangeListener);
-    }
-
-    @Override
-    public void stop(BundleContext bundleContext) throws Exception {
-        Job.getJobManager().removeJobChangeListener(jobChangeListener);
-    }
-}
diff --git a/jdtls.ext/pom.xml b/jdtls.ext/pom.xml
index 2cc36567..2616f9d5 100644
--- a/jdtls.ext/pom.xml
+++ b/jdtls.ext/pom.xml
@@ -23,7 +23,6 @@
 
     <modules>
         <module>com.microsoft.jdtls.ext.core</module>
-        <module>com.microsoft.jdtls.ext.activator</module>
     </modules>
     <build>
         <pluginManagement>
diff --git a/test/suite/buildTask.test.ts b/test/suite/buildTask.test.ts
index 8a4bab84..a861f73a 100644
--- a/test/suite/buildTask.test.ts
+++ b/test/suite/buildTask.test.ts
@@ -15,6 +15,7 @@ suite("Build Task Tests", () => {
     suiteSetup(setupTestEnv);
 
     test("test providing default build task", async function() {
+        this.timeout(60 * 1000 * 3);
         const vscodeTasks: Task[] = await tasks.fetchTasks();
         const exportJarTask: Task | undefined = vscodeTasks.find((t: Task) => {
             return t.name === BuildTaskProvider.defaultTaskName