diff --git a/AffdexMe/app/src/main/java/com/affectiva/affdexme/DrawingView.java b/AffdexMe/app/src/main/java/com/affectiva/affdexme/DrawingView.java
index 1fc8f50..45cc4e2 100644
--- a/AffdexMe/app/src/main/java/com/affectiva/affdexme/DrawingView.java
+++ b/AffdexMe/app/src/main/java/com/affectiva/affdexme/DrawingView.java
@@ -16,8 +16,6 @@ import android.util.Log;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 
-import com.affectiva.android.affdex.sdk.detector.Face;
-
 
 /**
  * This class contains a SurfaceView and its own thread that draws to it.
@@ -332,7 +330,7 @@ public class DrawingView extends SurfaceView implements SurfaceHolder.Callback {
 
         drawingThread = new DrawingThread(surfaceHolder, drawingViewConfig);
     }
-    
+
     public void setTypeface(Typeface face) {
         drawingViewConfig.textPaint.setTypeface(face);
         drawingViewConfig.textBorderPaint.setTypeface(face);
diff --git a/AffdexMe/app/src/main/java/com/affectiva/affdexme/MainActivity.java b/AffdexMe/app/src/main/java/com/affectiva/affdexme/MainActivity.java
index eb60d76..5f44a23 100644
--- a/AffdexMe/app/src/main/java/com/affectiva/affdexme/MainActivity.java
+++ b/AffdexMe/app/src/main/java/com/affectiva/affdexme/MainActivity.java
@@ -20,13 +20,6 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import android.widget.Toast;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.InputStreamReader;
-import java.lang.reflect.Method;
-import java.util.List;
 
 import com.affectiva.android.affdex.sdk.Frame;
 import com.affectiva.android.affdex.sdk.Frame.ROTATE;
@@ -34,6 +27,9 @@ import com.affectiva.android.affdex.sdk.detector.CameraDetector;
 import com.affectiva.android.affdex.sdk.detector.Detector;
 import com.affectiva.android.affdex.sdk.detector.Face;
 
+import java.lang.reflect.Method;
+import java.util.List;
+
 /*
  * AffdexMe is an app that demonstrates the use of the Affectiva Android SDK.  It uses the
  * front-facing camera on your Android device to view, process and analyze live video of your face.
diff --git a/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricDisplay.java b/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricDisplay.java
index 36f3c5a..42f64f2 100644
--- a/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricDisplay.java
+++ b/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricDisplay.java
@@ -8,7 +8,7 @@ import android.graphics.Paint;
 import android.graphics.Typeface;
 import android.util.AttributeSet;
 import android.view.View;
-import java.lang.Math;
+
 import java.lang.reflect.Method;
 
 /**
diff --git a/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelectionFragment.java b/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelectionFragment.java
index 0fe32fe..785b962 100644
--- a/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelectionFragment.java
+++ b/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelectionFragment.java
@@ -20,10 +20,10 @@ import android.widget.Button;
 import android.widget.GridLayout;
 import android.widget.TextView;
 
-import static com.affectiva.affdexme.MainActivity.NUM_METRICS_DISPLAYED;
-
 import java.util.ArrayList;
 import java.util.HashMap;
+
+import static com.affectiva.affdexme.MainActivity.NUM_METRICS_DISPLAYED;
 /**
  * A fragment to display a graphical menu which allows the user to select which metrics to display.
  *
diff --git a/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelector.java b/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelector.java
index 99b74d5..754ba01 100644
--- a/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelector.java
+++ b/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelector.java
@@ -1,12 +1,9 @@
 package com.affectiva.affdexme;
 
 import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.net.Uri;
-import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.TextureView;
 import android.view.View;
diff --git a/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricsManager.java b/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricsManager.java
index cf7c651..31da508 100644
--- a/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricsManager.java
+++ b/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricsManager.java
@@ -1,7 +1,5 @@
 package com.affectiva.affdexme;
 
-import java.lang.StringBuilder;
-
 /**
  * A class containing:
  *  -enumerations representing the Emotion and Expressions featured in the Affectiva SDK.
diff --git a/AffdexMe/app/src/main/java/com/affectiva/affdexme/SettingsActivity.java b/AffdexMe/app/src/main/java/com/affectiva/affdexme/SettingsActivity.java
index 0285177..310e556 100644
--- a/AffdexMe/app/src/main/java/com/affectiva/affdexme/SettingsActivity.java
+++ b/AffdexMe/app/src/main/java/com/affectiva/affdexme/SettingsActivity.java
@@ -5,7 +5,6 @@ import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
-import android.R.id.*;
 import android.view.MenuItem;
 
 import java.util.List;
diff --git a/AffdexMe/app/src/main/java/com/affectiva/errorreporting/ErrorReporter.java b/AffdexMe/app/src/main/java/com/affectiva/errorreporting/ErrorReporter.java
index 87e39ec..c019c55 100644
--- a/AffdexMe/app/src/main/java/com/affectiva/errorreporting/ErrorReporter.java
+++ b/AffdexMe/app/src/main/java/com/affectiva/errorreporting/ErrorReporter.java
@@ -1,7 +1,6 @@
 package com.affectiva.errorreporting;
 
 import android.app.Activity;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;