diff --git a/.gitignore b/.gitignore
index 2b75303ac58..ec3eca188cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.iml
+
 .gradle
 /local.properties
 /.idea/caches
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 66e2f6f1ca0..2996d531255 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,15 +3,11 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/library" />
-          </set>
-        </option>
         <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
diff --git a/.travis.yml b/.travis.yml
index c73f671caa9..4acb0867d0c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: android
 android:
   components:
     - tools
-    - build-tools-28.0.0
+    - build-tools-28.0.3
     - android-28
     - platform-tools
     - extra-android-support
@@ -15,9 +15,8 @@ android:
 sudo: required
 jdk:
   - oraclejdk8
-before_install:
-- chmod +x gradlew
-- chmod +rx app 
+install:
+  - true
 
-before_script:
-  - chmod +x gradlew
+script:
+  - ./gradlew build
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 6d6e6ded355..97e3bd9d6c5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,7 +21,7 @@ android {
         applicationId "io.getstream.chat.sdk"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 3
+        versionCode 2
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
index 25ba7b43b76..48122fdccaf 100644
Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 8fab2c77f11..b1d91796f22 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":3,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":2,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8482fdf46e9..ba5c9f84ec0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppThemeNoActionBar">
-        <activity android:name=".ChannelsActivity"></activity>
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/io/getstream/chat/sdk/AppInfo.java b/app/src/main/java/io/getstream/chat/sdk/AppInfo.java
deleted file mode 100644
index 678747ee8f4..00000000000
--- a/app/src/main/java/io/getstream/chat/sdk/AppInfo.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.getstream.chat.sdk;
-
-public class AppInfo {
-//    public static String USER_ID        = "broken-waterfall-5";
-//    public static String USER_NAME      = "Jon Snow";
-//    public static String USER_IMAGE     = "https://bit.ly/2u9Vc0r";
-//    public static String USER_ID        = "testuser1";
-//    public static String USER_NAME      = "Test User";
-//    public static String USER_IMAGE     = "https://bit.ly/2u9Vc0r";
-
-//    public static String USER_ID1       = "billowing-firefly-8";
-//    public static String USER_NAME1     = "Billowing firefly";
-//    public static String USER_IMAGE1    = "https://stepupandlive.files.wordpress.com/2014/09/3d-animated-frog-image.jpg";
-}
diff --git a/app/src/main/java/io/getstream/chat/sdk/AppSecretKey.java b/app/src/main/java/io/getstream/chat/sdk/AppSecretKey.java
deleted file mode 100644
index 9db3e9495d4..00000000000
--- a/app/src/main/java/io/getstream/chat/sdk/AppSecretKey.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.getstream.chat.sdk;
-
-public final class AppSecretKey {
-//    public static String API_KEY        = "qk4nn7rpcn75";
-
-    public static String API_KEY       = "cranwty2xrfm";
-}
diff --git a/app/src/main/java/io/getstream/chat/sdk/ChannelsActivity.java b/app/src/main/java/io/getstream/chat/sdk/ChannelsActivity.java
deleted file mode 100644
index 08c7d3036cd..00000000000
--- a/app/src/main/java/io/getstream/chat/sdk/ChannelsActivity.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.getstream.chat.sdk;
-
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-
-import com.getstream.sdk.chat.rest.core.StreamChat;
-import com.getstream.sdk.chat.utils.Global;
-import com.getstream.sdk.chat.view.fragment.ChannelListFragment;
-
-public class ChannelsActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_channels);
-        addGetStreamFragment(Global.streamChat);
-    }
-
-    private void addGetStreamFragment(@NonNull StreamChat streamChat) {
-        ChannelListFragment fragment = new ChannelListFragment();
-        fragment.containerResId = R.id.container;
-        fragment.streamChat = streamChat;
-        FragmentManager fragmentManager = getSupportFragmentManager();
-        FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
-        fragmentTransaction.replace(R.id.container, fragment);
-        fragmentTransaction.addToBackStack(null);
-        fragmentTransaction.commit();
-    }
-}
diff --git a/app/src/main/java/io/getstream/chat/sdk/MainActivity.java b/app/src/main/java/io/getstream/chat/sdk/MainActivity.java
index 38e75ad4c22..f6d5edf176d 100644
--- a/app/src/main/java/io/getstream/chat/sdk/MainActivity.java
+++ b/app/src/main/java/io/getstream/chat/sdk/MainActivity.java
@@ -23,7 +23,6 @@
 import com.getstream.sdk.chat.model.channel.Channel;
 import com.getstream.sdk.chat.model.enums.Token;
 import com.getstream.sdk.chat.rest.core.StreamChat;
-import com.getstream.sdk.chat.utils.Global;
 import com.getstream.sdk.chat.view.activity.ChatActivity;
 import com.getstream.sdk.chat.view.fragment.ChannelListFragment;
 
diff --git a/app/src/main/res/layout/activity_channels.xml b/app/src/main/res/layout/activity_channels.xml
deleted file mode 100644
index b9da446d330..00000000000
--- a/app/src/main/res/layout/activity_channels.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ChannelsActivity">
-    <FrameLayout
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fitsSystemWindows="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index c9ea61bb29d..cf82cde621b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,6 +26,8 @@ allprojects {
     }
 }
 
+
+
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
diff --git a/gradlew b/gradlew
index 491b21d1ae0..cccdd3d517f 100755
--- a/gradlew
+++ b/gradlew
@@ -76,12 +76,14 @@ if [ -n "$JAVA_HOME" ] ; then
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
     JAVACMD="java"
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
 fi
@@ -167,4 +169,4 @@ if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-exec "$JAVACMD" "$@"
\ No newline at end of file
+exec "$JAVACMD" "$@"
diff --git a/settings.gradle b/settings.gradle
index 4e217139051..c5b4d08137d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,2 @@
-include ':app', ':library'
-
+include ':library'
+//, ':app'