diff --git a/ext/client-core-android/pom.xml b/ext/client-core-android/pom.xml
index b5ac2eeca..706ecfae1 100644
--- a/ext/client-core-android/pom.xml
+++ b/ext/client-core-android/pom.xml
@@ -66,7 +66,27 @@
           </execution>
         </executions>
         <configuration>
-           <relocations>
+          <artifactSet>
+            <includes>
+              <include>org.apache.olingo:olingo-client-core-android</include>
+              <include>org.apache.olingo:olingo-client-core</include>
+              <include>org.apache.olingo:olingo-client-api</include>
+              <include>org.apache.olingo:olingo-commons-core</include>
+              <include>org.apache.olingo:olingo-commons-api</include>
+              <include>org.apache.commons:commons-lang3</include>
+              <include>org.slf4j:slf4j-api</include>
+              <include>commons-io:commons-io</include>
+              <include>com.fasterxml.jackson.core:jackson-core</include>
+              <include>com.fasterxml.jackson.core:jackson-databind</include>
+              <include>com.fasterxml.jackson.core:jackson-annotations</include>
+              <include>com.fasterxml.jackson.dataformat:jackson-dataformat-xml</include>
+              <include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations</include>
+              <include>org.codehaus.woodstox:stax2-api</include>
+              <include>javax.xml.stream:stax-api</include>
+              <include>com.fasterxml:aalto-xml</include>
+            </includes>
+          </artifactSet>
+          <relocations>
             <relocation>
               <pattern>javax.xml.stream</pattern>
               <shadedPattern>org.apache.olingo.javax.xml.stream</shadedPattern>
diff --git a/ext/client-proxy-android/pom.xml b/ext/client-proxy-android/pom.xml
index 5920c7256..90990c27e 100644
--- a/ext/client-proxy-android/pom.xml
+++ b/ext/client-proxy-android/pom.xml
@@ -40,11 +40,6 @@
       <artifactId>olingo-client-proxy</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.olingo</groupId>
-      <artifactId>olingo-client-core</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>com.google.android</groupId>
       <artifactId>android</artifactId>
@@ -71,7 +66,29 @@
           </execution>
         </executions>
         <configuration>
-           <relocations>
+          <artifactSet>
+            <includes>
+              <include>org.apache.olingo:olingo-client-proxy-android</include>
+              <include>org.apache.olingo:olingo-client-proxy</include>
+              <include>org.apache.olingo:olingo-client-core-android</include>
+              <include>org.apache.olingo:olingo-client-core</include>
+              <include>org.apache.olingo:olingo-client-api</include>
+              <include>org.apache.olingo:olingo-commons-core</include>
+              <include>org.apache.olingo:olingo-commons-api</include>
+              <include>org.apache.commons:commons-lang3</include>
+              <include>org.slf4j:slf4j-api</include>
+              <include>commons-io:commons-io</include>
+              <include>com.fasterxml.jackson.core:jackson-core</include>
+              <include>com.fasterxml.jackson.core:jackson-databind</include>
+              <include>com.fasterxml.jackson.core:jackson-annotations</include>
+              <include>com.fasterxml.jackson.dataformat:jackson-dataformat-xml</include>
+              <include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations</include>
+              <include>org.codehaus.woodstox:stax2-api</include>
+              <include>javax.xml.stream:stax-api</include>
+              <include>com.fasterxml:aalto-xml</include>
+            </includes>
+          </artifactSet>
+          <relocations>
             <relocation>
               <pattern>javax.xml.stream</pattern>
               <shadedPattern>org.apache.olingo.javax.xml.stream</shadedPattern>
diff --git a/ext/client-proxy-android/src/main/java/org/apache/olingo/client/core/android/http/AndroidHttpClientFactory.java b/ext/client-proxy-android/src/main/java/org/apache/olingo/client/core/android/http/AndroidHttpClientFactory.java
deleted file mode 100644
index c11a38fc6..000000000
--- a/ext/client-proxy-android/src/main/java/org/apache/olingo/client/core/android/http/AndroidHttpClientFactory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.apache.olingo.client.core.android.http;
-
-import android.net.http.AndroidHttpClient;
-import org.apache.http.client.HttpClient;
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.client.core.http.AbstractHttpClientFactory;
-
-import java.net.URI;
-
-public class AndroidHttpClientFactory extends AbstractHttpClientFactory {
-
-    private static final long serialVersionUID = -5224104561624556177L;
-
-    @Override
-    public AndroidHttpClient create(final HttpMethod method, final URI uri) {
-        return AndroidHttpClient.newInstance(USER_AGENT);
-    }
-
-    @Override
-    public void close(final HttpClient httpClient) {
-        if (httpClient instanceof AndroidHttpClient) {
-            ((AndroidHttpClient) httpClient).close();
-        }
-    }
-
-}