diff --git a/client/pom.xml b/client/pom.xml
index 112d5498..8860c04b 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -106,7 +106,6 @@
                                 --allow-incomplete-classpath
                                 -H:IncludeResources=org/jboss/fuse/mvnd/.*
                                 -H:IncludeResources=org/jline/utils/.*
-                                -H:EnableURLProtocols=https
                             </buildArgs>
                         </configuration>
                     </plugin>
diff --git a/client/src/main/java/org/jboss/fuse/mvnd/client/svm/ExtraFieldUtilsSubstitution.java b/client/src/main/java/org/jboss/fuse/mvnd/client/svm/ExtraFieldUtilsSubstitution.java
deleted file mode 100644
index 72ea6b3c..00000000
--- a/client/src/main/java/org/jboss/fuse/mvnd/client/svm/ExtraFieldUtilsSubstitution.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.fuse.mvnd.client.svm;
-
-import com.oracle.svm.core.annotate.Alias;
-import com.oracle.svm.core.annotate.KeepOriginal;
-import com.oracle.svm.core.annotate.RecomputeFieldValue;
-import com.oracle.svm.core.annotate.RecomputeFieldValue.Kind;
-import com.oracle.svm.core.annotate.Substitute;
-import com.oracle.svm.core.annotate.TargetClass;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.zip.ZipException;
-import org.apache.commons.compress.archivers.zip.AsiExtraField;
-import org.apache.commons.compress.archivers.zip.ExtraFieldParsingBehavior;
-import org.apache.commons.compress.archivers.zip.ExtraFieldUtils;
-import org.apache.commons.compress.archivers.zip.ExtraFieldUtils.UnparseableExtraField;
-import org.apache.commons.compress.archivers.zip.ZipExtraField;
-import org.apache.commons.compress.archivers.zip.ZipShort;
-
-@TargetClass(ExtraFieldUtils.class)
-@Substitute
-public final class ExtraFieldUtilsSubstitution {
-
-    @Alias
-    @RecomputeFieldValue(kind = Kind.None)
-    private static final Map<ZipShort, Class<?>> implementations;
-
-    static {
-        implementations = new ConcurrentHashMap<>();
-        registerInst(new AsiExtraField());
-    }
-
-    public static void registerInst(ZipExtraField ze) {
-        implementations.put(ze.getHeaderId(), ze.getClass());
-    }
-
-    @KeepOriginal
-    public static ZipExtraField createExtraField(final ZipShort headerId)
-            throws InstantiationException, IllegalAccessException {
-        return null;
-    }
-
-    @KeepOriginal
-    public static ZipExtraField createExtraFieldNoDefault(final ZipShort headerId)
-            throws InstantiationException, IllegalAccessException {
-        return null;
-    }
-
-    @KeepOriginal
-    public static ZipExtraField[] parse(final byte[] data) throws ZipException {
-        return null;
-    }
-
-    @KeepOriginal
-    public static ZipExtraField[] parse(final byte[] data, final boolean local)
-            throws ZipException {
-        return null;
-    }
-
-    @KeepOriginal
-    public static ZipExtraField[] parse(final byte[] data, final boolean local,
-            final UnparseableExtraField onUnparseableData)
-            throws ZipException {
-        return null;
-    }
-
-    @KeepOriginal
-    public static ZipExtraField[] parse(final byte[] data, final boolean local,
-            final ExtraFieldParsingBehavior parsingBehavior)
-            throws ZipException {
-        return null;
-    }
-
-    @KeepOriginal
-    public static byte[] mergeLocalFileDataData(final ZipExtraField[] data) {
-        return null;
-    }
-
-    @KeepOriginal
-    public static byte[] mergeCentralDirectoryData(final ZipExtraField[] data) {
-        return null;
-    }
-
-    @KeepOriginal
-    public static ZipExtraField fillExtraField(final ZipExtraField ze, final byte[] data, final int off,
-            final int len, final boolean local) throws ZipException {
-        return null;
-    }
-
-}
diff --git a/common/pom.xml b/common/pom.xml
index 58bf95b8..022fa6b3 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -32,11 +32,6 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-compress</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.jline</groupId>
             <artifactId>jline-terminal</artifactId>
diff --git a/common/src/main/resources/org/jboss/fuse/mvnd/common/mvnd.properties.template b/common/src/main/resources/org/jboss/fuse/mvnd/common/mvnd.properties.template
deleted file mode 100644
index cb9f56d1..00000000
--- a/common/src/main/resources/org/jboss/fuse/mvnd/common/mvnd.properties.template
+++ /dev/null
@@ -1,5 +0,0 @@
-# An absolute path to your Maven Daemon installation
-mvnd.home = %s
-
-# java.home is optional if you have JAVA_HOME environment variable set
-%s