diff --git a/app/build.gradle b/app/build.gradle
index 5dd89bee..06bf2efb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,7 +16,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         /*debug {
@@ -45,7 +45,7 @@ dependencies {
     }
     compile 'com.mikepenz:fontawesome-typeface:4.7.0.0@aar'
     compile 'pl.droidsonroids.gif:android-gif-drawable:1.2.7'
-    compile 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1'
+    compile 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1' //Deprecated!
     compile 'me.zhanghai.android.materialprogressbar:library:1.4.1'
     compile 'com.jakewharton.timber:timber:4.5.1'
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index ff7615bd..3b0e65f5 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -15,3 +15,20 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+# OkHttp
+-dontwarn okio.**
+-dontwarn javax.annotation.Nullable
+-dontwarn javax.annotation.ParametersAreNonnullByDefault
+
+# Picasso
+-dontwarn com.squareup.okhttp.**
+
+# Android-Iconics (fontawesome-typeface)
+-keep class .R
+-keep class **.R$* {
+    <fields>;
+}
+
+# android-gif-drawable
+-keep public class pl.droidsonroids.gif.GifIOException{<init>(int, java.lang.String);}
\ No newline at end of file
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/main/forum/ForumAdapter.java b/app/src/main/java/gr/thmmy/mthmmy/activities/main/forum/ForumAdapter.java
index 9f896b29..821c83a5 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/main/forum/ForumAdapter.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/main/forum/ForumAdapter.java
@@ -26,7 +26,6 @@ import gr.thmmy.mthmmy.model.TopicSummary;
  * specified {@link ForumFragment.ForumFragmentInteractionListener}.
  */
 class ForumAdapter extends ExpandableRecyclerAdapter<Category, Board, ForumAdapter.CategoryViewHolder, ForumAdapter.BoardViewHolder> {
-    private final Context context;
     private final LayoutInflater layoutInflater;
 
     private final List<Category> categories;
@@ -34,7 +33,6 @@ class ForumAdapter extends ExpandableRecyclerAdapter<Category, Board, ForumAdapt
 
     ForumAdapter(Context context, @NonNull List<Category> categories, BaseFragment.FragmentInteractionListener listener) {
         super(categories);
-        this.context = context;
         this.categories = categories;
         mListener = (ForumFragment.ForumFragmentInteractionListener) listener;
         layoutInflater = LayoutInflater.from(context);