remove libs - that comes from a subtree/submodule merge

38 files changed, 0 insertions, 3598 deletions

diff --git a/libs/utils/WordPressUtils/build.gradle b/libs/utils/WordPressUtils/build.gradle
deleted file mode 100644
index da68c80de..000000000
--- a/libs/utils/WordPressUtils/build.gradle
+++ /dev/null
@@ -1,55 +0,0 @@
-
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+'
-    }
-}
-
-apply plugin: 'com.android.library'
-apply plugin: 'maven'
-
-repositories {
-    mavenCentral()
-    maven { url 'http://wordpress-mobile.github.io/WordPress-Android' }
-}
-
-dependencies {
-    compile 'commons-lang:commons-lang:2.6'
-    compile 'com.mcxiaoke.volley:library:1.0.+'
-    compile 'com.github.castorflex.smoothprogressbar:library:0.4.0'
-    compile 'org.wordpress:pulltorefresh-main:+@aar' // org.wordpress version includes some fixes
-    compile 'com.android.support:support-v13:19.0.+'
-}
-
-android {
-    defaultPublishConfig 'debug'
-
-    compileSdkVersion 19
-    buildToolsVersion "19.1.0"
-
-    defaultConfig {
-        applicationId "org.wordpress.android.util"
-        versionName "1.0.2"
-        versionCode 1
-        minSdkVersion 14
-        targetSdkVersion 19
-    }
-}
-
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            def repo_url = ""
-            if (project.hasProperty("repository")) {
-                repo_url = project.repository
-            }
-            repository(url: repo_url)
-            pom.version = android.defaultConfig.versionName
-            pom.groupId = "org.wordpress"
-            pom.artifactId = "wordpress-utils"
-        }
-    }
-}
diff --git a/libs/utils/WordPressUtils/gradle.properties-example b/libs/utils/WordPressUtils/gradle.properties-example
deleted file mode 100644
index 36ceb8db2..000000000
--- a/libs/utils/WordPressUtils/gradle.properties-example
+++ /dev/null
@@ -1 +0,0 @@
-repository=file:///Users/max/work/automattic/WordPress-Android-gh-pages/
diff --git a/libs/utils/WordPressUtils/src/main/AndroidManifest.xml b/libs/utils/WordPressUtils/src/main/AndroidManifest.xml
deleted file mode 100644
index 4f3bd125a..000000000
--- a/libs/utils/WordPressUtils/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="org.wordpress.android.util">
-
-</manifest>
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AlertUtil.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AlertUtil.java
deleted file mode 100644
index 76800de4c..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AlertUtil.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2011 wordpress.org
- *
- * 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.wordpress.android.util;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-
-public class AlertUtil {
-    /**
-     * Show Alert Dialog
-     * @param context
-     * @param titleId
-     * @param messageId
-     */
-    public static void showAlert(Context context, int titleId, int messageId) {
-        Dialog dlg = new AlertDialog.Builder(context)
-            .setTitle(titleId)
-            .setPositiveButton(android.R.string.ok, null)
-            .setMessage(messageId)
-            .create();
-
-        dlg.show();
-    }
-
-    /**
-     * Show Alert Dialog
-     * @param context
-     * @param titleId
-     * @param messageId
-     */
-    public static void showAlert(Context context, int titleId, String message) {
-        Dialog dlg = new AlertDialog.Builder(context)
-            .setTitle(titleId)
-            .setPositiveButton(android.R.string.ok, null)
-            .setMessage(message)
-            .create();
-
-        dlg.show();
-    }
-
-    /**
-     * Show Alert Dialog
-     * @param context
-     * @param titleId
-     * @param messageId
-     * @param positiveButtontxt
-     * @param positiveListener
-     * @param negativeButtontxt
-     * @param negativeListener
-     */
-    public static void showAlert(Context context, int titleId, int messageId,
-            CharSequence positiveButtontxt, DialogInterface.OnClickListener positiveListener,
-            CharSequence negativeButtontxt, DialogInterface.OnClickListener negativeListener) {
-        Dialog dlg = new AlertDialog.Builder(context)
-            .setTitle(titleId)
-            .setPositiveButton(positiveButtontxt, positiveListener)
-            .setNegativeButton(negativeButtontxt, negativeListener)
-            .setMessage(messageId)
-            .setCancelable(false)
-            .create();
-
-        dlg.show();
-    }
-
-    /**
-     * Show Alert Dialog
-     * @param context
-     * @param titleId
-     * @param messageId
-     * @param positiveButtontxt
-     * @param positiveListener
-     */
-    public static void showAlert(Context context, int titleId, String message,
-            CharSequence positiveButtontxt, DialogInterface.OnClickListener positiveListener) {
-        Dialog dlg = new AlertDialog.Builder(context)
-            .setTitle(titleId)
-            .setPositiveButton(positiveButtontxt, positiveListener)
-            .setMessage(message)
-            .setCancelable(false)
-            .create();
-
-        dlg.show();
-    }
-}
-
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AppLog.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AppLog.java
deleted file mode 100644
index f2fff1b2e..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AppLog.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.Context;
-import android.text.TextUtils;
-import android.util.Log;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-/**
- * simple wrapper for Android log calls, enables recording & displaying log
- */
-public class AppLog {
-    // T for Tag
-    public enum T {READER, EDITOR, MEDIA, NUX, API, STATS, UTILS, NOTIFS, DB, POSTS, COMMENTS, THEMES, TESTS, PROFILING, SIMPERIUM}
-    public static final String TAG = "WordPress";
-
-    private static boolean mEnableRecording = false;
-
-    private AppLog() {
-        throw new AssertionError();
-    }
-
-    /*
-     * defaults to false, pass true to capture log so it can be displayed by AppLogViewerActivity
-     */
-    public static void enableRecording(boolean enable) {
-        mEnableRecording = enable;
-    }
-
-    public static void v(T tag, String message) {
-        Log.v(TAG + "-" + tag.toString(), message);
-        addEntry(tag, LogLevel.v, message);
-    }
-
-    public static void d(T tag, String message) {
-        Log.d(TAG + "-" + tag.toString(), message);
-        addEntry(tag, LogLevel.d, message);
-    }
-
-    public static void i(T tag, String message) {
-        Log.i(TAG + "-" + tag.toString(), message);
-        addEntry(tag, LogLevel.i, message);
-    }
-
-    public static void w(T tag, String message) {
-        Log.w(TAG + "-" + tag.toString(), message);
-        addEntry(tag, LogLevel.w, message);
-    }
-
-    public static void e(T tag, String message) {
-        Log.e(TAG + "-" + tag.toString(), message);
-        addEntry(tag, LogLevel.e, message);
-    }
-
-    public static void e(T tag, String message, Throwable tr) {
-        Log.e(TAG + "-" + tag.toString(), message, tr);
-        addEntry(tag, LogLevel.e, message + " - exception: " + tr.getMessage());
-        addEntry(tag, LogLevel.e, "StackTrace: " + getHTMLStringStackTrace(tr));
-    }
-
-    public static void e(T tag, Throwable tr) {
-        Log.e(TAG + "-" + tag.toString(), tr.getMessage(), tr);
-        addEntry(tag, LogLevel.e, tr.getMessage());
-        addEntry(tag, LogLevel.e, "StackTrace: " + getHTMLStringStackTrace(tr));
-    }
-
-    public static void e(T tag, String volleyErrorMsg, int statusCode) {
-        if (TextUtils.isEmpty(volleyErrorMsg)) {
-            return;
-        }
-        String logText;
-        if (statusCode == -1) {
-            logText = volleyErrorMsg;
-        } else {
-            logText = volleyErrorMsg + ", status " + statusCode;
-        }
-        Log.e(TAG + "-" + tag.toString(), logText);
-        addEntry(tag, LogLevel.w, logText);
-    }
-
-    // --------------------------------------------------------------------------------------------------------
-
-    private static final int MAX_ENTRIES = 99;
-
-    private enum LogLevel {
-        v, d, i, w, e;
-        private String toHtmlColor() {
-            switch(this) {
-                case v:
-                    return "grey";
-                case i:
-                    return "black";
-                case w:
-                    return "purple";
-                case e:
-                    return "red";
-                case d:
-                default:
-                    return "teal";
-            }
-        }
-    }
-
-    private static class LogEntry {
-        LogLevel logLevel;
-        String logText;
-        T logTag;
-
-        private String toHtml() {
-            StringBuilder sb = new StringBuilder()
-                    .append("<font color='")
-                    .append(logLevel.toHtmlColor())
-                    .append("'>")
-                    .append("[")
-                    .append(logTag.name())
-                    .append("] ")
-                    .append(logLevel.name())
-                    .append(": ")
-                    .append(logText)
-                    .append("</font>");
-            return sb.toString();
-        }
-    }
-
-    private static class LogEntryList extends ArrayList<LogEntry> {
-        private synchronized boolean addEntry(LogEntry entry) {
-            if (size() >= MAX_ENTRIES)
-                removeFirstEntry();
-            return add(entry);
-        }
-        private void removeFirstEntry() {
-            Iterator<LogEntry> it = iterator();
-            if (!it.hasNext())
-                return;
-            try {
-                remove(it.next());
-            } catch (NoSuchElementException e) {
-                // ignore
-            }
-        }
-    }
-
-    private static LogEntryList mLogEntries = new LogEntryList();
-
-    private static void addEntry(T tag, LogLevel level, String text) {
-        // skip if recording is disabled (default)
-        if (!mEnableRecording)
-            return;
-        LogEntry entry = new LogEntry();
-        entry.logLevel = level;
-        entry.logText = text;
-        entry.logTag = tag;
-        mLogEntries.addEntry(entry);
-    }
-
-    private static String getStringStackTrace(Throwable throwable) {
-        StringWriter errors = new StringWriter();
-        throwable.printStackTrace(new PrintWriter(errors));
-        return errors.toString();
-    }
-
-    private static String getHTMLStringStackTrace(Throwable throwable) {
-        return getStringStackTrace(throwable).replace("\n", "<br/>");
-    }
-
-    /*
-     * returns entire log as html for display (see AppLogViewerActivity)
-     */
-    public static String toHtml(Context context) {
-        StringBuilder sb = new StringBuilder();
-
-        // add version & device info
-        sb.append("WordPress Android version: " + ProfilingUtils.getVersionName(context)).append("<br />")
-          .append("Android device name: " + DeviceUtils.getInstance().getDeviceName(context)).append("<br />");
-
-        Iterator<LogEntry> it = mLogEntries.iterator();
-        int lineNum = 1;
-        while (it.hasNext()) {
-            sb.append("<font color='silver'>")
-              .append(String.format("%02d", lineNum))
-              .append("</font> ")
-              .append(it.next().toHtml())
-              .append("<br />");
-            lineNum++;
-        }
-        return sb.toString();
-    }
-
-
-    /*
-     * returns entire log as plain text
-     */
-    public static String toPlainText(Context context) {
-        StringBuilder sb = new StringBuilder();
-
-        // add version & device info
-        sb.append("WordPress Android version: " + ProfilingUtils.getVersionName(context)).append("\n")
-          .append("Android device name: " + DeviceUtils.getInstance().getDeviceName(context)).append("\n\n");
-
-        Iterator<LogEntry> it = mLogEntries.iterator();
-        int lineNum = 1;
-        while (it.hasNext()) {
-              sb.append(String.format("%02d - ", lineNum))
-              .append(it.next().logText)
-              .append("\n");
-            lineNum++;
-        }
-        return sb.toString();
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/BlogUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/BlogUtils.java
deleted file mode 100644
index 166085a4f..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/BlogUtils.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.wordpress.android.util;
-
-import java.util.Comparator;
-import java.util.Map;
-
-public class BlogUtils {
-    public static Comparator<Object> BlogNameComparator = new Comparator<Object>() {
-        public int compare(Object blog1, Object blog2) {
-            Map<Object, Object> blogMap1 = (Map<Object, Object>) blog1;
-            Map<Object, Object> blogMap2 = (Map<Object, Object>) blog2;
-
-            String blogName1 = MapUtils.getMapStr(blogMap1, "blogName");
-            if (blogName1.length() == 0) {
-                blogName1 = MapUtils.getMapStr(blogMap1, "url");
-            }
-
-            String blogName2 = MapUtils.getMapStr(blogMap2, "blogName");
-            if (blogName2.length() == 0) {
-                blogName2 = MapUtils.getMapStr(blogMap2, "url");
-            }
-
-            return blogName1.compareToIgnoreCase(blogName2);
-        }
-    };
-}
\ No newline at end of file
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/DeviceUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/DeviceUtils.java
deleted file mode 100644
index 639d5479c..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/DeviceUtils.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.Build;
-
-import org.wordpress.android.util.AppLog.T;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-public class DeviceUtils {
-    private static DeviceUtils instance;
-    private boolean isKindleFire = false;
-
-    public boolean isKindleFire() {
-        return isKindleFire;
-    }
-
-    public static DeviceUtils getInstance() {
-        if (instance == null) {
-            instance = new DeviceUtils();
-        }
-        return instance;
-    }
-
-    private DeviceUtils() {
-        isKindleFire = android.os.Build.MODEL.equalsIgnoreCase("kindle fire") ? true: false;
-    }
-
-    /**
-     * Checks camera availability recursively based on API level.
-     *
-     * TODO: change "android.hardware.camera.front" and "android.hardware.camera.any" to
-     *     {@link PackageManager#FEATURE_CAMERA_FRONT} and {@link PackageManager#FEATURE_CAMERA_ANY},
-     *     respectively, once they become accessible or minSdk version is incremented.
-     *
-     * @param context The context.
-     * @return Whether camera is available.
-     */
-    public boolean hasCamera(Context context) {
-        final PackageManager pm = context.getPackageManager();
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            return pm.hasSystemFeature(PackageManager.FEATURE_CAMERA)
-                    || pm.hasSystemFeature("android.hardware.camera.front");
-        }
-
-        return pm.hasSystemFeature("android.hardware.camera.any");
-    }
-
-    public String getDeviceName(Context context) {
-        String manufacturer = Build.MANUFACTURER;
-        String undecodedModel = Build.MODEL;
-        String model = null;
-
-        try {
-            Properties prop = new Properties();
-            InputStream fileStream;
-            // Read the device name from a precomplied list:
-            // see http://making.meetup.com/post/29648976176/human-readble-android-device-names
-            fileStream = context.getAssets().open("android_models.properties");
-            prop.load(fileStream);
-            fileStream.close();
-            String decodedModel = prop.getProperty(undecodedModel.replaceAll(" ", "_"));
-            if (decodedModel != null && !decodedModel.trim().equals("")) {
-                model = decodedModel;
-            }
-        } catch (IOException e) {
-            AppLog.e(T.UTILS, e.getMessage());
-        }
-
-        if (model == null) {  //Device model not found in the list
-            if (undecodedModel.startsWith(manufacturer)) {
-                model = capitalize(undecodedModel);
-            } else {
-                model = capitalize(manufacturer) + " " + undecodedModel;
-            }
-        }
-        return model;
-    }
-
-    private String capitalize(String s) {
-        if (s == null || s.length() == 0) {
-            return "";
-        }
-        char first = s.charAt(0);
-        if (Character.isUpperCase(first)) {
-            return s;
-        } else {
-            return Character.toUpperCase(first) + s.substring(1);
-        }
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/DisplayUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/DisplayUtils.java
deleted file mode 100644
index f64527e9a..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/DisplayUtils.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.Context;
-import android.content.res.Configuration;
-import android.graphics.Point;
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
-import android.view.Display;
-import android.view.Window;
-import android.view.WindowManager;
-
-public class DisplayUtils {
-    private DisplayUtils() {
-        throw new AssertionError();
-    }
-
-    public static boolean isLandscape(Context context) {
-        if (context == null)
-            return false;
-        return context.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
-    }
-
-    public static boolean isLandscapeTablet(Context context) {
-        return isLandscape(context) && isTablet(context);
-    }
-
-    public static Point getDisplayPixelSize(Context context) {
-        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-        Display display = wm.getDefaultDisplay();
-        Point size = new Point();
-        display.getSize(size);
-        return size;
-    }
-
-    public static int getDisplayPixelWidth(Context context) {
-        Point size = getDisplayPixelSize(context);
-        return (size.x);
-    }
-
-    public static int getDisplayPixelHeight(Context context) {
-        Point size = getDisplayPixelSize(context);
-        return (size.y);
-    }
-
-    public static int dpToPx(Context context, int dp) {
-        float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, context.getResources().getDisplayMetrics());
-        return (int) px;
-    }
-
-    public static int pxToDp(Context context, int px) {
-        DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
-        return (int) ((px/displayMetrics.density)+0.5);
-    }
-
-    public static boolean isTablet(Context context) {
-        // http://stackoverflow.com/a/8427523/1673548
-        if (context == null)
-            return false;
-        return (context.getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE;
-    }
-
-    public static boolean isXLarge(Context context) {
-        if ((context.getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_XLARGE)
-            return true;
-        return false;
-    }
-
-    /**
-     * returns the height of the ActionBar if one is enabled - supports both the native ActionBar
-     * and ActionBarSherlock - http://stackoverflow.com/a/15476793/1673548
-     */
-    public static int getActionBarHeight(Context context) {
-        if (context == null) {
-            return 0;
-        }
-        TypedValue tv = new TypedValue();
-        if (context.getTheme() != null
-                && context.getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true)) {
-            return TypedValue.complexToDimensionPixelSize(tv.data, context.getResources().getDisplayMetrics());
-        }
-
-        // if we get this far, it's because the device doesn't support an ActionBar,
-        // so return the standard ActionBar height (48dp)
-        return dpToPx(context, 48);
-    }
-
-    /**
-     * detect when FEATURE_ACTION_BAR_OVERLAY has been set
-     */
-    public static boolean hasActionBarOverlay(Window window) {
-        return window.hasFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/EditTextUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/EditTextUtils.java
deleted file mode 100644
index 64ee67e56..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/EditTextUtils.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.Context;
-import android.text.TextUtils;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
-
-/**
- * EditText utils
- */
-public class EditTextUtils {
-    private EditTextUtils() {
-        throw new AssertionError();
-    }
-
-    /**
-     * returns text string from passed EditText
-     */
-    public static String getText(EditText edit) {
-        if (edit.getText() == null) {
-            return "";
-        }
-        return edit.getText().toString();
-    }
-
-    /**
-     * moves caret to end of text
-     */
-    public static void moveToEnd(EditText edit) {
-        if (edit.getText() == null) {
-            return;
-        }
-        edit.setSelection(edit.getText().toString().length());
-    }
-
-    /**
-     * returns true if nothing has been entered into passed editor
-     */
-    public static boolean isEmpty(EditText edit) {
-        return TextUtils.isEmpty(getText(edit));
-    }
-
-    /**
-     * hide the soft keyboard for the passed EditText
-     */
-    public static void hideSoftInput(EditText edit) {
-        if (edit == null) {
-            return;
-        }
-
-        InputMethodManager imm = getInputMethodManager(edit);
-        if (imm != null) {
-            imm.hideSoftInputFromWindow(edit.getWindowToken(), 0);
-        }
-    }
-
-    /**
-     * show the soft keyboard for the passed EditText
-     */
-    public static void showSoftInput(EditText edit) {
-        if (edit == null) {
-            return;
-        }
-
-        edit.requestFocus();
-
-        InputMethodManager imm = getInputMethodManager(edit);
-        if (imm != null) {
-            imm.showSoftInput(edit, InputMethodManager.SHOW_IMPLICIT);
-        }
-    }
-
-    private static InputMethodManager getInputMethodManager(EditText edit) {
-        Context context = edit.getContext();
-        return (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/Emoticons.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/Emoticons.java
deleted file mode 100644
index 5a7566a96..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/Emoticons.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.wordpress.android.util;
-
-import android.text.Html;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.style.ForegroundColorSpan;
-import android.text.style.ImageSpan;
-import android.util.SparseArray;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import static android.os.Build.VERSION.SDK_INT;
-import static android.os.Build.VERSION_CODES;
-
-public class Emoticons {
-    public static final int EMOTICON_COLOR = 0xFF21759B;
-    private static final boolean HAS_EMOJI = SDK_INT >= VERSION_CODES.JELLY_BEAN;
-    private static final Map<String, String> wpSmilies;
-    public static final SparseArray<String> wpSmiliesCodePointToText;
-
-    static {
-        Map<String, String> smilies = new HashMap<String, String>();
-        smilies.put("icon_mrgreen.gif",   HAS_EMOJI ? "\uD83D\uDE00" : ":mrgreen:" );
-        smilies.put("icon_neutral.gif",   HAS_EMOJI ? "\uD83D\uDE14" : ":|" );
-        smilies.put("icon_twisted.gif",   HAS_EMOJI ? "\uD83D\uDE16" : ":twisted:" );
-        smilies.put("icon_arrow.gif",     HAS_EMOJI ? "\u27A1" : ":arrow:" );
-        smilies.put("icon_eek.gif",       HAS_EMOJI ? "\uD83D\uDE32" : "8-O" );
-        smilies.put("icon_smile.gif",     HAS_EMOJI ? "\uD83D\uDE0A" : ":)" );
-        smilies.put("icon_confused.gif",  HAS_EMOJI ? "\uD83D\uDE15" : ":?" );
-        smilies.put("icon_cool.gif",      HAS_EMOJI ? "\uD83D\uDE0A" : "8)" );
-        smilies.put("icon_evil.gif",      HAS_EMOJI ? "\uD83D\uDE21" : ":evil:" );
-        smilies.put("icon_biggrin.gif",   HAS_EMOJI ? "\uD83D\uDE03" : ":D" );
-        smilies.put("icon_idea.gif",      HAS_EMOJI ? "\uD83D\uDCA1" : ":idea:" );
-        smilies.put("icon_redface.gif",   HAS_EMOJI ? "\uD83D\uDE33" : ":oops:" );
-        smilies.put("icon_razz.gif",      HAS_EMOJI ? "\uD83D\uDE1D" : ":P" );
-        smilies.put("icon_rolleyes.gif",  HAS_EMOJI ? "\uD83D\uDE0F" : ":roll:" );
-        smilies.put("icon_wink.gif",      HAS_EMOJI ? "\uD83D\uDE09" : ";)" );
-        smilies.put("icon_cry.gif",       HAS_EMOJI ? "\uD83D\uDE22" : ":'(" );
-        smilies.put("icon_surprised.gif", HAS_EMOJI ? "\uD83D\uDE32" : ":o" );
-        smilies.put("icon_lol.gif",       HAS_EMOJI ? "\uD83D\uDE03" : ":lol:" );
-        smilies.put("icon_mad.gif",       HAS_EMOJI ? "\uD83D\uDE21" : ":x" );
-        smilies.put("icon_sad.gif",       HAS_EMOJI ? "\uD83D\uDE1E" : ":(" );
-        smilies.put("icon_exclaim.gif",   HAS_EMOJI ? "\u2757" : ":!:" );
-        smilies.put("icon_question.gif",  HAS_EMOJI ? "\u2753" : ":?:" );
-
-        wpSmilies = Collections.unmodifiableMap(smilies);
-
-        wpSmiliesCodePointToText = new SparseArray<String>(20);
-        wpSmiliesCodePointToText.put(10145, ":arrow:");
-        wpSmiliesCodePointToText.put(128161, ":idea:");
-        wpSmiliesCodePointToText.put(128512, ":mrgreen:");
-        wpSmiliesCodePointToText.put(128515, ":D");
-        wpSmiliesCodePointToText.put(128522, ":)");
-        wpSmiliesCodePointToText.put(128521, ";)");
-        wpSmiliesCodePointToText.put(128532, ":|");
-        wpSmiliesCodePointToText.put(128533, ":?");
-        wpSmiliesCodePointToText.put(128534, ":twisted:");
-        wpSmiliesCodePointToText.put(128542, ":(");
-        wpSmiliesCodePointToText.put(128545, ":evil:");
-        wpSmiliesCodePointToText.put(128546, ":'(");
-        wpSmiliesCodePointToText.put(128562, ":o");
-        wpSmiliesCodePointToText.put(128563, ":oops:");
-        wpSmiliesCodePointToText.put(128527, ":roll:");
-        wpSmiliesCodePointToText.put(10071, ":!:");
-        wpSmiliesCodePointToText.put(10067, ":?:");
-    }
-
-    public static String lookupImageSmiley(String url){
-        return lookupImageSmiley(url, "");
-    }
-
-    public static String lookupImageSmiley(String url, String ifNone){
-        String file = url.substring(url.lastIndexOf("/") + 1);
-        if (wpSmilies.containsKey(file)) {
-            return wpSmilies.get(file);
-        }
-        return ifNone;
-    }
-
-    public static Spanned replaceEmoticonsWithEmoji(SpannableStringBuilder html){
-        ImageSpan imgs[] = html.getSpans(0, html.length(), ImageSpan.class);
-        for (ImageSpan img : imgs) {
-            String emoticon = Emoticons.lookupImageSmiley(img.getSource());
-            if (!emoticon.equals("")) {
-                int start = html.getSpanStart(img);
-                html.replace(start, html.getSpanEnd(img), emoticon);
-                html.setSpan(new ForegroundColorSpan(EMOTICON_COLOR), start,
-                             start + emoticon.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-                html.removeSpan(img);
-            }
-        }
-        return html;
-    }
-
-    public static String replaceEmoticonsWithEmoji(final String text) {
-        if (text != null && text.contains("icon_")) {
-            final SpannableStringBuilder html = (SpannableStringBuilder)replaceEmoticonsWithEmoji((SpannableStringBuilder) Html.fromHtml(text));
-            // Html.toHtml() is used here rather than toString() since the latter strips html
-            return Html.toHtml(html);
-        } else {
-            return text;
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/FormatUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/FormatUtils.java
deleted file mode 100644
index 28282ed5f..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/FormatUtils.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.wordpress.android.util;
-
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
-
-public class FormatUtils {
-    /*
-     * NumberFormat isn't synchronized, so a separate instance must be created for each thread
-     * http://developer.android.com/reference/java/text/NumberFormat.html
-     */
-    private static final ThreadLocal<NumberFormat> IntegerInstance = new ThreadLocal<NumberFormat>() {
-        @Override
-        protected NumberFormat initialValue() {
-            return NumberFormat.getIntegerInstance();
-        }
-    };
-
-    private static final ThreadLocal<DecimalFormat> DecimalInstance = new ThreadLocal<DecimalFormat>() {
-        @Override
-        protected DecimalFormat initialValue() {
-            return (DecimalFormat) DecimalFormat.getInstance();
-        }
-    };
-
-    /*
-     * returns the passed integer formatted with thousands-separators based on the current locale
-     */
-    public static final String formatInt(int value) {
-        return IntegerInstance.get().format(value).toString();
-    }
-
-    public static final String formatDecimal(int value) {
-        return DecimalInstance.get().format(value).toString();
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/GeocoderUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/GeocoderUtils.java
deleted file mode 100644
index e861a88b8..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/GeocoderUtils.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.Context;
-import android.location.Address;
-import android.location.Geocoder;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Locale;
-
-public final class GeocoderUtils {
-    private GeocoderUtils() {
-        throw new AssertionError();
-    }
-
-    public static Geocoder getGeocoder(Context context) {
-        // first make sure a Geocoder service exists on this device (requires API 9)
-        if (!Geocoder.isPresent()) {
-            return null;
-        }
-
-        Geocoder gcd;
-
-        try {
-            gcd = new Geocoder(context, Locale.getDefault());
-        } catch (NullPointerException cannotIstantiateEx) {
-            AppLog.e(AppLog.T.UTILS, "Cannot instantiate Geocoder", cannotIstantiateEx);
-            return null;
-        }
-
-        return gcd;
-    }
-
-    public static Address getAddressFromCoords(Context context, double latitude, double longitude) {
-        Address address = null;
-        List<Address> addresses = null;
-
-        Geocoder gcd = getGeocoder(context);
-
-        if (gcd == null) {
-            return null;
-        }
-
-        try {
-            addresses = gcd.getFromLocation(latitude, longitude, 1);
-        } catch (IOException e) {
-            // may get "Unable to parse response from server" IOException here if Geocoder
-            // service is hit too frequently
-            AppLog.e(AppLog.T.UTILS,
-                    "Unable to parse response from server. Is Geocoder service hitting the server too frequently?",
-                    e
-            );
-        }
-
-        // addresses may be null or empty if network isn't connected
-        if (addresses != null && addresses.size() > 0) {
-            address = addresses.get(0);
-        }
-
-        return address;
-    }
-
-    public static Address getAddressFromLocationName(Context context, String locationName) {
-        int maxResults = 1;
-        Address address = null;
-        List<Address> addresses = null;
-
-        Geocoder gcd = getGeocoder(context);
-
-        if (gcd == null) {
-            return null;
-        }
-
-        try {
-            addresses = gcd.getFromLocationName(locationName, maxResults);
-        } catch (IOException e) {
-            AppLog.e(AppLog.T.UTILS, "Failed to get coordinates from location", e);
-        }
-
-        // addresses may be null or empty if network isn't connected
-        if (addresses != null && addresses.size() > 0) {
-            address = addresses.get(0);
-        }
-
-        return address;
-    }
-
-    public static String getLocationNameFromAddress(Address address) {
-        String locality = "", adminArea = "", country = "";
-        if (address.getLocality() != null) {
-            locality = address.getLocality();
-        }
-
-        if (address.getAdminArea() != null) {
-            adminArea = address.getAdminArea();
-        }
-
-        if (address.getCountryName() != null) {
-            country = address.getCountryName();
-        }
-
-        return ((locality.equals("")) ? locality : locality + ", ")
-                + ((adminArea.equals("")) ? adminArea : adminArea + " ") + country;
-    }
-
-    public static double[] getCoordsFromAddress(Address address) {
-        double[] coordinates = new double[2];
-
-        if (address.hasLatitude() && address.hasLongitude()) {
-            coordinates[0] = address.getLatitude();
-            coordinates[1] = address.getLongitude();
-        }
-
-        return coordinates;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/GravatarUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/GravatarUtils.java
deleted file mode 100644
index c10ce69c8..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/GravatarUtils.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.wordpress.android.util;
-
-import android.text.TextUtils;
-
-public class GravatarUtils {
-    /*
-     * see https://en.gravatar.com/site/implement/images/
-     */
-    public static String gravatarUrlFromEmail(final String email, int size) {
-        if (TextUtils.isEmpty(email))
-            return "";
-
-        String url = "http://gravatar.com/avatar/"
-                    + StringUtils.getMd5Hash(email)
-                    + "?d=mm";
-
-        if (size > 0)
-            url += "&s=" + Integer.toString(size);
-
-        return url;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/HtmlUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/HtmlUtils.java
deleted file mode 100644
index c79fe0ecb..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/HtmlUtils.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.text.Html;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.text.style.ForegroundColorSpan;
-import android.text.style.QuoteSpan;
-
-import org.apache.commons.lang.StringEscapeUtils;
-
-public class HtmlUtils {
-    /*
-     * removes html from the passed string - relies on Html.fromHtml which handles invalid HTML,
-     * but it's very slow, so avoid using this where performance is important
-     */
-    public static String stripHtml(final String text) {
-        if (TextUtils.isEmpty(text)) {
-            return "";
-        }
-        return Html.fromHtml(text).toString().trim();
-    }
-
-    /*
-     * this is much faster than stripHtml() but should only be used when we know the html is valid
-     * since the regex will be unpredictable with invalid html
-     */
-    public static String fastStripHtml(String str) {
-        if (TextUtils.isEmpty(str)) {
-            return str;
-        }
-
-        // insert a line break before P tags unless the only one is at the start
-        if (str.lastIndexOf("<p") > 0) {
-            str = str.replaceAll("<p(.|\n)*?>", "\n<p>");
-        }
-
-        // convert BR tags to line breaks
-        if (str.contains("<br")) {
-            str = str.replaceAll("<br(.|\n)*?>", "\n");
-        }
-
-        // use regex to strip tags, then convert entities in the result
-        return trimStart(fastUnescapeHtml(str.replaceAll("<(.|\n)*?>", "")));
-    }
-
-    /*
-     * same as apache.commons.lang.StringUtils.stripStart() but also removes non-breaking
-     * space (160) chars
-     */
-    private static String trimStart(final String str) {
-        int strLen;
-        if (str == null || (strLen = str.length()) == 0) {
-            return "";
-        }
-        int start = 0;
-        while (start != strLen && (Character.isWhitespace(str.charAt(start)) || str.charAt(start) == 160)) {
-            start++;
-        }
-        return str.substring(start);
-    }
-
-    /*
-     * convert html entities to actual Unicode characters - relies on commons apache lang
-     */
-    public static String fastUnescapeHtml(final String text) {
-        if (text == null || !text.contains("&")) {
-            return text;
-        }
-        return StringEscapeUtils.unescapeHtml(text);
-    }
-
-    /*
-     * converts an R.color.xxx resource to an HTML hex color
-     */
-    public static String colorResToHtmlColor(Context context, int resId) {
-        try {
-            return String.format("#%06X", 0xFFFFFF & context.getResources().getColor(resId));
-        } catch (Resources.NotFoundException e) {
-            return "#000000";
-        }
-    }
-
-    /*
-     * remove <script>..</script> blocks from the passed string - added to project after noticing
-     * comments on posts that use the "Sociable" plugin ( http://wordpress.org/plugins/sociable/ )
-     * may have a script block which contains <!--//--> followed by a CDATA section followed by <!]]>,
-     * all of which will show up if we don't strip it here (example: http://cl.ly/image/0J0N3z3h1i04 )
-     * first seen at http://houseofgeekery.com/2013/11/03/13-terrible-x-men-we-wont-see-in-the-movies/
-     */
-    public static String stripScript(final String text) {
-        if (text == null) {
-            return null;
-        }
-
-        StringBuilder sb = new StringBuilder(text);
-        int start = sb.indexOf("<script");
-
-        while (start > -1) {
-            int end = sb.indexOf("</script>", start);
-            if (end == -1) {
-                return sb.toString();
-            }
-            sb.delete(start, end + 9);
-            start = sb.indexOf("<script", start);
-        }
-
-        return sb.toString();
-    }
-
-    /**
-     * an alternative to Html.fromHtml() supporting <ul>, <ol>, <blockquote> tags and replacing Emoticons with Emojis
-     */
-    public static SpannableStringBuilder fromHtml(String source, WPImageGetter wpImageGetter) {
-        SpannableStringBuilder html;
-        try {
-            html = (SpannableStringBuilder) Html.fromHtml(source, wpImageGetter, new WPHtmlTagHandler());
-        } catch (RuntimeException runtimeException) {
-            // In case our tag handler fails
-            html = (SpannableStringBuilder) Html.fromHtml(source, wpImageGetter, null);
-        }
-        Emoticons.replaceEmoticonsWithEmoji(html);
-        QuoteSpan spans[] = html.getSpans(0, html.length(), QuoteSpan.class);
-        for (QuoteSpan span : spans) {
-            html.setSpan(new WPQuoteSpan(), html.getSpanStart(span), html.getSpanEnd(span), html.getSpanFlags(span));
-            html.setSpan(new ForegroundColorSpan(0xFF666666), html.getSpanStart(span), html.getSpanEnd(span),
-                    html.getSpanFlags(span));
-            html.removeSpan(span);
-        }
-        return html;
-    }
-
-    public static Spanned fromHtml(String source) {
-        return fromHtml(source, null);
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ImageUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ImageUtils.java
deleted file mode 100644
index 31dadc911..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ImageUtils.java
+++ /dev/null
@@ -1,554 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.media.ExifInterface;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.provider.MediaStore;
-import android.text.TextUtils;
-import android.widget.ImageView;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.ref.WeakReference;
-
-public class ImageUtils {
-    public static int[] getImageSize(Uri uri, Context context){
-        String path = null;
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        options.inJustDecodeBounds = true;
-
-        if (uri.toString().contains("content:")) {
-            String[] projection = new String[] { MediaStore.Images.Media._ID, MediaStore.Images.Media.DATA };
-            Cursor cur = context.getContentResolver().query(uri, projection, null, null, null);
-            if (cur != null) {
-                if (cur.moveToFirst()) {
-                    int dataColumn = cur.getColumnIndex(MediaStore.Images.Media.DATA);
-                    path = cur.getString(dataColumn);
-                }
-                cur.close();
-            }
-        }
-
-        if (TextUtils.isEmpty(path)) {
-            //The file isn't ContentResolver, or it can't be access by ContentResolver. Try to access the file directly.
-            path = uri.toString().replace("content://media", "");
-            path = path.replace("file://", "");
-        }
-
-        BitmapFactory.decodeFile(path, options);
-        int imageHeight = options.outHeight;
-        int imageWidth = options.outWidth;
-        return new int[]{imageWidth, imageHeight};
-    }
-
-    // Read the orientation from ContentResolver. If it fails, read from EXIF.
-    public static int getImageOrientation(Context ctx, String filePath) {
-        Uri curStream;
-        int orientation = 0;
-
-        // Remove file protocol
-        filePath = filePath.replace("file://", "");
-
-        if (!filePath.contains("content://"))
-            curStream = Uri.parse("content://media" + filePath);
-        else
-            curStream = Uri.parse(filePath);
-
-        try {
-            Cursor cur = ctx.getContentResolver().query(curStream, new String[]{MediaStore.Images.Media.ORIENTATION}, null, null, null);
-            if (cur != null) {
-                if (cur.moveToFirst()) {
-                    orientation = cur.getInt(cur.getColumnIndex(MediaStore.Images.Media.ORIENTATION));
-                }
-                cur.close();
-            }
-        } catch (Exception errReadingContentResolver) {
-            AppLog.e(AppLog.T.UTILS, errReadingContentResolver);
-        }
-
-        if (orientation == 0) {
-            orientation = getExifOrientation(filePath);
-        }
-
-        return orientation;
-    }
-
-
-    public static int getExifOrientation(String path) {
-        ExifInterface exif;
-        try {
-            exif = new ExifInterface(path);
-        } catch (IOException e) {
-            AppLog.e(AppLog.T.UTILS, e);
-            return 0;
-        }
-
-        int exifOrientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, 0);
-
-        switch (exifOrientation) {
-            case ExifInterface.ORIENTATION_NORMAL:
-                return 0;
-            case ExifInterface.ORIENTATION_ROTATE_90:
-                return 90;
-            case ExifInterface.ORIENTATION_ROTATE_180:
-                return 180;
-            case ExifInterface.ORIENTATION_ROTATE_270:
-                return 270;
-            default:
-                return 0;
-        }
-    }
-
-    public static Bitmap downloadBitmap(String url) {
-        final DefaultHttpClient client = new DefaultHttpClient();
-
-        final HttpGet getRequest = new HttpGet(url);
-
-        try {
-            HttpResponse response = client.execute(getRequest);
-            final int statusCode = response.getStatusLine().getStatusCode();
-            if (statusCode != HttpStatus.SC_OK) {
-                AppLog.w(AppLog.T.UTILS, "ImageDownloader Error " + statusCode
-                        + " while retrieving bitmap from " + url);
-                return null;
-            }
-
-            final HttpEntity entity = response.getEntity();
-            if (entity != null) {
-                InputStream inputStream = null;
-                try {
-                    inputStream = entity.getContent();
-                    return BitmapFactory.decodeStream(inputStream);
-                } finally {
-                    if (inputStream != null) {
-                        inputStream.close();
-                    }
-                    entity.consumeContent();
-                }
-            }
-        } catch (Exception e) {
-            // Could provide a more explicit error message for IOException or
-            // IllegalStateException
-            getRequest.abort();
-            AppLog.w(AppLog.T.UTILS, "ImageDownloader Error while retrieving bitmap from " + url);
-        }
-        return null;
-    }
-
-    /** From http://developer.android.com/training/displaying-bitmaps/load-bitmap.html **/
-    public static int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight) {
-        // Raw height and width of image
-        final int height = options.outHeight;
-        final int width = options.outWidth;
-        int inSampleSize = 1;
-
-        if (height > reqHeight || width > reqWidth) {
-            // Calculate ratios of height and width to requested height and width
-            final int heightRatio = Math.round((float) height / (float) reqHeight);
-            final int widthRatio = Math.round((float) width / (float) reqWidth);
-
-            // Choose the smallest ratio as inSampleSize value, this will guarantee
-            // a final image with both dimensions larger than or equal to the
-            // requested height and width.
-            inSampleSize = heightRatio < widthRatio ? heightRatio : widthRatio;
-        }
-
-        return inSampleSize;
-    }
-
-
-    public interface BitmapWorkerCallback {
-        public void onBitmapReady(String filePath, ImageView imageView, Bitmap bitmap);
-    }
-
-    public static class BitmapWorkerTask extends AsyncTask<String, Void, Bitmap> {
-        private final WeakReference<ImageView> imageViewReference;
-        private final BitmapWorkerCallback callback;
-        private int targetWidth;
-        private int targetHeight;
-        private String path;
-
-        public BitmapWorkerTask(ImageView imageView, int width, int height, BitmapWorkerCallback callback) {
-            // Use a WeakReference to ensure the ImageView can be garbage collected
-            imageViewReference = new WeakReference<ImageView>(imageView);
-            this.callback = callback;
-            targetWidth = width;
-            targetHeight = height;
-        }
-
-        // Decode image in background.
-        @Override
-        protected Bitmap doInBackground(String... params) {
-            path = params[0];
-
-            BitmapFactory.Options bfo = new BitmapFactory.Options();
-            bfo.inJustDecodeBounds = true;
-            BitmapFactory.decodeFile(path, bfo);
-
-            bfo.inSampleSize = calculateInSampleSize(bfo, targetWidth, targetHeight);
-            bfo.inJustDecodeBounds = false;
-
-            // get proper rotation
-            int bitmapWidth = 0;
-            int bitmapHeight = 0;
-            try {
-                File f = new File(path);
-                ExifInterface exif = new ExifInterface(f.getPath());
-                int orientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL);
-                int angle = 0;
-                if (orientation == ExifInterface.ORIENTATION_NORMAL) { // no need to rotate
-                    return BitmapFactory.decodeFile(path, bfo);
-                } else if (orientation == ExifInterface.ORIENTATION_ROTATE_90) {
-                    angle = 90;
-                } else if (orientation == ExifInterface.ORIENTATION_ROTATE_180) {
-                    angle = 180;
-                } else if (orientation == ExifInterface.ORIENTATION_ROTATE_270) {
-                    angle = 270;
-                }
-
-                Matrix mat = new Matrix();
-                mat.postRotate(angle);
-
-                try {
-                    Bitmap bmp = BitmapFactory.decodeStream(new FileInputStream(f), null, bfo);
-                    if (bmp == null) {
-                        AppLog.e(AppLog.T.UTILS, "can't decode bitmap: " + f.getPath());
-                        return null;
-                    }
-                    bitmapWidth = bmp.getWidth();
-                    bitmapHeight = bmp.getHeight();
-                    return Bitmap.createBitmap(bmp, 0, 0, bmp.getWidth(), bmp.getHeight(), mat, true);
-                } catch (OutOfMemoryError oom) {
-                    AppLog.e(AppLog.T.UTILS, "OutOfMemoryError Error in setting image: " + oom);
-                }
-            } catch (IOException e) {
-                AppLog.e(AppLog.T.UTILS, "Error in setting image", e);
-            }
-
-            return null;
-        }
-
-        // Once complete, see if ImageView is still around and set bitmap.
-        @Override
-        protected void onPostExecute(Bitmap bitmap) {
-            if (imageViewReference == null || bitmap == null)
-                return;
-
-            final ImageView imageView = imageViewReference.get();
-
-            if (callback != null)
-                callback.onBitmapReady(path, imageView, bitmap);
-
-        }
-    }
-
-
-    public static String getTitleForWPImageSpan(Context ctx, String filePath) {
-        if (filePath == null)
-            return null;
-
-        Uri curStream;
-        String title;
-
-        if (!filePath.contains("content://"))
-            curStream = Uri.parse("content://media" + filePath);
-        else
-            curStream = Uri.parse(filePath);
-
-        if (filePath.contains("video")) {
-            return "Video";
-        } else {
-            String[] projection = new String[] { MediaStore.Images.Thumbnails.DATA };
-
-            Cursor cur;
-            try {
-                cur = ctx.getContentResolver().query(curStream, projection, null, null, null);
-            } catch (Exception e1) {
-                AppLog.e(AppLog.T.UTILS, e1);
-                return null;
-            }
-            File jpeg;
-            if (cur != null) {
-                String thumbData = "";
-                if (cur.moveToFirst()) {
-                    int dataColumn = cur.getColumnIndex(MediaStore.Images.Media.DATA);
-                    thumbData = cur.getString(dataColumn);
-                }
-                cur.close();
-                if (thumbData == null) {
-                    return null;
-                }
-                jpeg = new File(thumbData);
-            } else {
-                String path = filePath.toString().replace("file://", "");
-                jpeg = new File(path);
-            }
-            title = jpeg.getName();
-            return title;
-        }
-    }
-
-    /**
-     * Resizes an image to be placed in the Post Content Editor
-     *
-     * @return resized bitmap
-     */
-    public static Bitmap getWPImageSpanThumbnailFromFilePath(Context context, String filePath, int targetWidth) {
-        if (filePath == null || context == null) {
-            return null;
-        }
-
-        Uri curUri;
-        if (!filePath.contains("content://")) {
-            curUri = Uri.parse("content://media" + filePath);
-        } else {
-            curUri = Uri.parse(filePath);
-        }
-
-        if (filePath.contains("video")) {
-            // Load the video thumbnail from the MediaStore
-            int videoId = 0;
-            try {
-                videoId = Integer.parseInt(curUri.getLastPathSegment());
-            } catch (NumberFormatException e) {
-            }
-            ContentResolver crThumb = context.getContentResolver();
-            BitmapFactory.Options options = new BitmapFactory.Options();
-            options.inSampleSize = 1;
-            Bitmap videoThumbnail = MediaStore.Video.Thumbnails.getThumbnail(crThumb, videoId, MediaStore.Video.Thumbnails.MINI_KIND,
-                    options);
-            if (videoThumbnail != null) {
-                return getScaledBitmapAtLongestSide(videoThumbnail, targetWidth);
-            } else {
-                return null;
-            }
-        } else {
-            // Create resized bitmap
-            int rotation = getImageOrientation(context, filePath);
-            byte[] bytes = createThumbnailFromUri(context, curUri, targetWidth, null, rotation);
-
-            if (bytes != null && bytes.length > 0) {
-                try {
-                    Bitmap resizedBitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
-                    if (resizedBitmap != null) {
-                        return getScaledBitmapAtLongestSide(resizedBitmap, targetWidth);
-                    }
-                } catch (OutOfMemoryError e) {
-                    AppLog.e(AppLog.T.UTILS, "OutOfMemoryError Error in setting image: " + e);
-                    return null;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /*
-     Resize a bitmap to the targetSize on its longest side.
-     */
-    public static Bitmap getScaledBitmapAtLongestSide(Bitmap bitmap, int targetSize) {
-        if (bitmap.getWidth() <= targetSize && bitmap.getHeight() <= targetSize) {
-            // Do not resize.
-            return bitmap;
-        }
-
-        int targetWidth, targetHeight;
-        if (bitmap.getHeight() > bitmap.getWidth()) {
-            // Resize portrait bitmap
-            targetHeight = targetSize;
-            float percentage = (float) targetSize / bitmap.getHeight();
-            targetWidth = (int)(bitmap.getWidth() * percentage);
-        } else {
-            // Resize landscape or square image
-            targetWidth = targetSize;
-            float percentage = (float) targetSize / bitmap.getWidth();
-            targetHeight = (int)(bitmap.getHeight() * percentage);
-        }
-
-        return Bitmap.createScaledBitmap(bitmap, targetWidth, targetHeight, true);
-    }
-
-    /**
-     * nbradbury - 21-Feb-2014 - similar to createThumbnail but more efficient since it doesn't
-     * require passing the full-size image as an array of bytes[]
-     */
-    public static byte[] createThumbnailFromUri(Context context,
-                                                Uri imageUri,
-                                                int maxWidth,
-                                                String fileExtension,
-                                                int rotation) {
-        if (context == null || imageUri == null || maxWidth <= 0)
-            return null;
-
-        String filePath = null;
-        if (imageUri.toString().contains("content:")) {
-            String[] projection = new String[] { MediaStore.Images.Media.DATA };
-            Cursor cur = context.getContentResolver().query(imageUri, projection, null, null, null);
-            if (cur != null) {
-                if (cur.moveToFirst()) {
-                    int dataColumn = cur.getColumnIndex(MediaStore.Images.Media.DATA);
-                    filePath = cur.getString(dataColumn);
-                }
-                cur.close();
-            }
-        }
-
-        if (TextUtils.isEmpty(filePath)) {
-            //access the file directly
-            filePath = imageUri.toString().replace("content://media", "");
-            filePath = filePath.replace("file://", "");
-        }
-
-        // get just the image bounds
-        BitmapFactory.Options optBounds = new BitmapFactory.Options();
-        optBounds.inJustDecodeBounds = true;
-
-        try {
-            BitmapFactory.decodeFile(filePath, optBounds);
-        } catch (OutOfMemoryError e) {
-            AppLog.e(AppLog.T.UTILS, "OutOfMemoryError Error in setting image: " + e);
-            return null;
-        }
-
-        // determine correct scale value (should be power of 2)
-        // http://stackoverflow.com/questions/477572/android-strange-out-of-memory-issue/3549021#3549021
-        int scale = 1;
-        if (maxWidth > 0 && optBounds.outWidth > maxWidth) {
-            double d = Math.pow(2, (int) Math.round(Math.log(maxWidth / (double) optBounds.outWidth) / Math.log(0.5)));
-            scale = (int) d;
-        }
-
-        BitmapFactory.Options optActual = new BitmapFactory.Options();
-        optActual.inSampleSize = scale;
-
-        // Get the roughly resized bitmap
-        Bitmap bmpResized;
-        try {
-            bmpResized = BitmapFactory.decodeFile(filePath, optActual);
-        } catch (OutOfMemoryError e) {
-            AppLog.e(AppLog.T.UTILS, "OutOfMemoryError Error in setting image: " + e);
-            return null;
-        }
-
-        if (bmpResized == null)
-            return null;
-
-        ByteArrayOutputStream stream = new ByteArrayOutputStream();
-
-        // Now calculate exact scale in order to resize accurately
-        float percentage = (float) maxWidth / bmpResized.getWidth();
-        float proportionateHeight = bmpResized.getHeight() * percentage;
-        int finalHeight = (int) Math.rint(proportionateHeight);
-
-        float scaleWidth = ((float) maxWidth) / bmpResized.getWidth();
-        float scaleHeight = ((float) finalHeight) / bmpResized.getHeight();
-
-        float scaleBy = Math.min(scaleWidth, scaleHeight);
-
-        // Resize the bitmap to exact size
-        Matrix matrix = new Matrix();
-        matrix.postScale(scaleBy, scaleBy);
-
-        // apply rotation
-        if (rotation != 0) {
-            matrix.setRotate(rotation);
-        }
-
-        Bitmap.CompressFormat fmt;
-        if (fileExtension != null && fileExtension.equalsIgnoreCase("png")) {
-            fmt = Bitmap.CompressFormat.PNG;
-        } else {
-            fmt = Bitmap.CompressFormat.JPEG;
-        }
-
-        final Bitmap bmpRotated;
-        try {
-            bmpRotated = Bitmap.createBitmap(bmpResized, 0, 0, bmpResized.getWidth(), bmpResized.getHeight(), matrix,
-                    true);
-        } catch (OutOfMemoryError e) {
-            AppLog.e(AppLog.T.UTILS, "OutOfMemoryError Error in setting image: " + e);
-            return null;
-        }
-        bmpRotated.compress(fmt, 100, stream);
-        bmpResized.recycle();
-        bmpRotated.recycle();
-
-        return stream.toByteArray();
-    }
-
-    public static Bitmap getCircularBitmap(final Bitmap bitmap) {
-        if (bitmap==null)
-            return null;
-
-        final Bitmap output = Bitmap.createBitmap(bitmap.getWidth(), bitmap.getHeight(), Bitmap.Config.ARGB_8888);
-        final Canvas canvas = new Canvas(output);
-        final Paint paint = new Paint();
-        final Rect rect = new Rect(0, 0, bitmap.getWidth(), bitmap.getHeight());
-        final RectF rectF = new RectF(rect);
-
-        paint.setAntiAlias(true);
-        canvas.drawARGB(0, 0, 0, 0);
-        paint.setColor(Color.RED);
-        canvas.drawOval(rectF, paint);
-
-        paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
-        canvas.drawBitmap(bitmap, rect, rect, paint);
-
-        // outline
-        paint.setStyle(Paint.Style.STROKE);
-        paint.setStrokeWidth(1f);
-        paint.setColor(Color.DKGRAY);
-        canvas.drawOval(rectF, paint);
-
-        return output;
-    }
-
-    public static Bitmap getRoundedEdgeBitmap(final Bitmap bitmap, int radius) {
-        if (bitmap == null) {
-            return null;
-        }
-
-        final Bitmap output = Bitmap.createBitmap(bitmap.getWidth(), bitmap.getHeight(), Bitmap.Config.ARGB_8888);
-        final Canvas canvas = new Canvas(output);
-        final Paint paint = new Paint();
-        final Rect rect = new Rect(0, 0, bitmap.getWidth(), bitmap.getHeight());
-        final RectF rectF = new RectF(rect);
-
-        paint.setAntiAlias(true);
-        canvas.drawARGB(0, 0, 0, 0);
-        paint.setColor(Color.RED);
-        canvas.drawRoundRect(rectF, radius, radius, paint);
-
-        paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
-        canvas.drawBitmap(bitmap, rect, rect, paint);
-
-        paint.setStyle(Paint.Style.STROKE);
-        paint.setStrokeWidth(1f);
-        paint.setColor(Color.DKGRAY);
-        canvas.drawRoundRect(rectF, radius, radius, paint);
-
-        return output;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/JSONUtil.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/JSONUtil.java
deleted file mode 100644
index 199fba703..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/JSONUtil.java
+++ /dev/null
@@ -1,236 +0,0 @@
-package org.wordpress.android.util;
-
-import android.text.TextUtils;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.wordpress.android.util.AppLog.T;
-
-import java.util.ArrayList;
-
-public class JSONUtil {
-    private static String QUERY_SEPERATOR=".";
-    private static String QUERY_ARRAY_INDEX_START="[";
-    private static String QUERY_ARRAY_INDEX_END="]";
-    private static String QUERY_ARRAY_FIRST="first";
-    private static String QUERY_ARRAY_LAST="last";
-
-    private static final String JSON_NULL_STR = "null";
-
-    private static final String TAG="JSONUtil";
-    /**
-     * Given a JSONObject and a key path (e.g property.child) and a default it will
-     * traverse the object graph and pull out the desired property
-     */
-    public static <U> U queryJSON(JSONObject source, String query, U defaultObject) {
-        int nextSeperator = query.indexOf(QUERY_SEPERATOR);
-        int nextIndexStart = query.indexOf(QUERY_ARRAY_INDEX_START);
-        if (nextSeperator == -1 && nextIndexStart == -1) {
-            // last item let's get it
-            try {
-                if (!source.has(query)) {
-                    return defaultObject;
-                }
-                Object result = source.get(query);
-                if (result.getClass().isAssignableFrom(defaultObject.getClass())) {
-                    return (U) result;
-                } else {
-                    return defaultObject;
-                }
-            } catch (java.lang.ClassCastException e) {
-                AppLog.e(T.UTILS, "Unable to cast the object to " + defaultObject.getClass().getName(), e);
-                return defaultObject;
-            } catch (JSONException e) {
-                AppLog.e(T.UTILS, "Unable to get the Key from the input object. Key:" + query, e);
-                return defaultObject;
-            }
-        }
-        int endQuery;
-        if (nextSeperator == -1 || nextIndexStart == -1) {
-            endQuery = Math.max(nextSeperator, nextIndexStart);
-        } else {
-            endQuery = Math.min(nextSeperator, nextIndexStart);
-        }
-        String nextQuery = query.substring(endQuery);
-        String key = query.substring(0, endQuery);
-        try {
-            if (source == null) {
-                return defaultObject;
-            }
-            if (nextQuery.indexOf(QUERY_SEPERATOR) == 0) {
-                return queryJSON(source.getJSONObject(key), nextQuery.substring(1), defaultObject);
-            } else if (nextQuery.indexOf(QUERY_ARRAY_INDEX_START) == 0) {
-                return queryJSON(source.getJSONArray(key), nextQuery, defaultObject);
-            } else if (!nextQuery.equals("")) {
-                return defaultObject;
-            }
-            Object result = source.get(key);
-            if (result.getClass().isAssignableFrom(defaultObject.getClass())) {
-                return (U) result;
-            } else {
-                AppLog.w(T.UTILS, String.format("The returned object type %s is not assignable to the type %s. Using default!",
-                        result.getClass(),defaultObject.getClass()));
-                return defaultObject;
-            }
-        } catch (java.lang.ClassCastException e) {
-            AppLog.e(T.UTILS, "Unable to cast the object to " + defaultObject.getClass().getName(), e);
-            return defaultObject;
-        } catch (JSONException e) {
-            AppLog.e(T.UTILS, "Unable to get the Key from the input object. Key:" + query, e);
-            return defaultObject;
-        }
-    }
-
-    /**
-     * Given a JSONArray and a query (e.g. [0].property) it will traverse the array and
-     * pull out the requested property.
-     *
-     * Acceptable indexes include negative numbers to reference items from the end of
-     * the list as well as "last" and "first" as more explicit references to "0" and "-1"
-     */
-    public static <U> U queryJSON(JSONArray source, String query, U defaultObject){
-        // query must start with [ have an index and then have ]
-        int indexStart = query.indexOf(QUERY_ARRAY_INDEX_START);
-        int indexEnd = query.indexOf(QUERY_ARRAY_INDEX_END);
-        if (indexStart == -1 || indexEnd == -1 || indexStart > indexEnd) {
-            return defaultObject;
-        }
-        // get "index" from "[index]"
-        String indexStr = query.substring(indexStart + 1, indexEnd);
-        int index;
-        if (indexStr.equals(QUERY_ARRAY_FIRST)) {
-            index = 0;
-        } else if (indexStr.equals(QUERY_ARRAY_LAST)) {
-            index = -1;
-        } else {
-            index = Integer.parseInt(indexStr);
-        }
-        if (index < 0) {
-            index = source.length() + index;
-        }
-        // copy remaining query
-        String remainingQuery = query.substring(indexEnd + 1);
-        try {
-            if (remainingQuery.indexOf(QUERY_ARRAY_INDEX_START) == 0) {
-                return queryJSON(source.getJSONArray(index), remainingQuery, defaultObject);
-            } else if (remainingQuery.indexOf(QUERY_SEPERATOR) == 0) {
-                return queryJSON(source.getJSONObject(index), remainingQuery.substring(1), defaultObject);
-            } else if (!remainingQuery.equals("")) {
-                // TODO throw an exception since the query isn't valid?
-                AppLog.w(T.UTILS, String.format("Incorrect query for next object %s", remainingQuery));
-                return defaultObject;
-            }
-            Object result = source.get(index);
-            if (result.getClass().isAssignableFrom(defaultObject.getClass())) {
-                return (U) result;
-            } else {
-                AppLog.w(T.UTILS, String.format("The returned object type %s is not assignable to the type %s. Using default!",
-                        result.getClass(),defaultObject.getClass()));
-                return defaultObject;
-            }
-        } catch (java.lang.ClassCastException e) {
-            AppLog.e(T.UTILS, "Unable to cast the object to "+defaultObject.getClass().getName(), e);
-            return defaultObject;
-        } catch (JSONException e) {
-            AppLog.e(T.UTILS, "Unable to get the Key from the input object. Key:" + query, e);
-            return defaultObject;
-        }
-    }
-
-    /**
-     * Convert a JSONArray (expected to contain strings) in a string list
-     */
-    public static ArrayList<String> fromJSONArrayToStringList(JSONArray jsonArray) {
-        ArrayList<String> stringList = new ArrayList<String>();
-        for (int i = 0; i < jsonArray.length(); i++) {
-            try {
-                stringList.add(jsonArray.getString(i));
-            } catch (JSONException e) {
-                AppLog.e(T.UTILS, e);
-            }
-        }
-        return stringList;
-    }
-
-    /**
-     * Convert a string list in a JSONArray
-     */
-    public static JSONArray fromStringListToJSONArray(ArrayList<String> stringList) {
-        JSONArray jsonArray = new JSONArray();
-        if (stringList != null) {
-            for (int i = 0; i < stringList.size(); i++) {
-                jsonArray.put(stringList.get(i));
-            }
-        }
-        return jsonArray;
-    }
-
-    /*
-     * wrapper for JSONObject.optString() which handles "null" values
-     */
-    public static String getString(JSONObject json, String name) {
-        String value = json.optString(name);
-        // return empty string for "null"
-        if (JSON_NULL_STR.equals(value))
-            return "";
-        return value;
-    }
-
-    /*
-     * use with strings that contain HTML entities
-     */
-    public static String getStringDecoded(JSONObject json, String name) {
-        String value = getString(json, name);
-        return HtmlUtils.fastUnescapeHtml(value);
-    }
-
-    /*
-     * replacement for JSONObject.optBoolean()  - optBoolean() only checks for "true" and "false",
-     * but our API sometimes uses "0" to denote false
-     */
-    public static boolean getBool(JSONObject json, String name) {
-        String value = getString(json, name);
-        if (TextUtils.isEmpty(value))
-            return false;
-        if (value.equals("0"))
-            return false;
-        if (value.equalsIgnoreCase("false"))
-            return false;
-        return true;
-    }
-
-    /*
-     * returns the JSONObject child of the passed parent that matches the passed query
-     * this is basically an "optJSONObject" that supports nested queries, for example:
-     *
-     *  getJSONChild("meta/data/site")
-     *
-     * would find this:
-     *
-     *  "meta": {
-     *       "data": {
-     *           "site": {
-     *                "ID": 3584907,
-     *                "name": "WordPress.com News",
-     *           }
-     *       }
-     *   }
-     */
-    public static JSONObject getJSONChild(final JSONObject jsonParent, final String query) {
-        if (jsonParent == null || TextUtils.isEmpty(query))
-            return null;
-        String[] names = query.split("/");
-        JSONObject jsonChild = null;
-        for (int i = 0; i < names.length; i++) {
-            if (jsonChild == null) {
-                jsonChild = jsonParent.optJSONObject(names[i]);
-            } else {
-                jsonChild = jsonChild.optJSONObject(names[i]);
-            }
-            if (jsonChild == null)
-                return null;
-        }
-        return jsonChild;
-    }
-}
\ No newline at end of file
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ListScrollPositionManager.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ListScrollPositionManager.java
deleted file mode 100644
index d60e9da6c..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ListScrollPositionManager.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.wordpress.android.util;
-
-import android.view.View;
-import android.widget.ListView;
-
-public class ListScrollPositionManager {
-    private int mSelectedPosition;
-    private int mListViewScrollStateIndex;
-    private int mListViewScrollStateOffset;
-    private ListView mListView;
-    private boolean mSetSelection;
-
-    public ListScrollPositionManager(ListView listView, boolean setSelection) {
-        mListView = listView;
-        mSetSelection = setSelection;
-    }
-
-    public void saveScrollOffset() {
-        mListViewScrollStateIndex = mListView.getFirstVisiblePosition();
-        View view = mListView.getChildAt(0);
-        mListViewScrollStateOffset = 0;
-        if (view != null) {
-            mListViewScrollStateOffset = view.getTop();
-        }
-        if (mSetSelection) {
-            mSelectedPosition = mListView.getCheckedItemPosition();
-        }
-    }
-
-    public void restoreScrollOffset() {
-        mListView.setSelectionFromTop(mListViewScrollStateIndex, mListViewScrollStateOffset);
-        if (mSetSelection) {
-            mListView.setItemChecked(mSelectedPosition, true);
-        }
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/LocationHelper.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/LocationHelper.java
deleted file mode 100644
index 12439fd28..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/LocationHelper.java
+++ /dev/null
@@ -1,132 +0,0 @@
-//This Handy-Dandy class acquired and tweaked from http://stackoverflow.com/a/3145655/309558
-package org.wordpress.android.util;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-import android.content.Context;
-import android.location.Location;
-import android.location.LocationListener;
-import android.location.LocationManager;
-import android.os.Bundle;
-
-public class LocationHelper {
-    Timer timer1;
-    LocationManager lm;
-    LocationResult locationResult;
-    boolean gps_enabled = false;
-    boolean network_enabled = false;
-
-    public boolean getLocation(Context context, LocationResult result) {
-        locationResult = result;
-        if (lm == null)
-            lm = (LocationManager) context
-                    .getSystemService(Context.LOCATION_SERVICE);
-
-        // exceptions will be thrown if provider is not permitted.
-        try {
-            gps_enabled = lm.isProviderEnabled(LocationManager.GPS_PROVIDER);
-        } catch (Exception ex) {
-        }
-        try {
-            network_enabled = lm.isProviderEnabled(LocationManager.NETWORK_PROVIDER);
-        } catch (Exception ex) {
-        }
-
-        // don't start listeners if no provider is enabled
-        if (!gps_enabled && !network_enabled)
-            return false;
-
-        if (gps_enabled)
-            lm.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, locationListenerGps);
-
-        if (network_enabled)
-            lm.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 0, 0, locationListenerNetwork);
-
-        timer1 = new Timer();
-        timer1.schedule(new GetLastLocation(), 30000);
-        return true;
-    }
-
-    LocationListener locationListenerGps = new LocationListener() {
-        public void onLocationChanged(Location location) {
-            timer1.cancel();
-            locationResult.gotLocation(location);
-            lm.removeUpdates(this);
-            lm.removeUpdates(locationListenerNetwork);
-        }
-
-        public void onProviderDisabled(String provider) {
-        }
-
-        public void onProviderEnabled(String provider) {
-        }
-
-        public void onStatusChanged(String provider, int status, Bundle extras) {
-        }
-    };
-
-    LocationListener locationListenerNetwork = new LocationListener() {
-        public void onLocationChanged(Location location) {
-            timer1.cancel();
-            locationResult.gotLocation(location);
-            lm.removeUpdates(this);
-            lm.removeUpdates(locationListenerGps);
-        }
-
-        public void onProviderDisabled(String provider) {
-        }
-
-        public void onProviderEnabled(String provider) {
-        }
-
-        public void onStatusChanged(String provider, int status, Bundle extras) {
-        }
-    };
-
-    class GetLastLocation extends TimerTask {
-        @Override
-        public void run() {
-            lm.removeUpdates(locationListenerGps);
-            lm.removeUpdates(locationListenerNetwork);
-
-            Location net_loc = null, gps_loc = null;
-            if (gps_enabled)
-                gps_loc = lm.getLastKnownLocation(LocationManager.GPS_PROVIDER);
-            if (network_enabled)
-                net_loc = lm
-                        .getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
-
-            // if there are both values use the latest one
-            if (gps_loc != null && net_loc != null) {
-                if (gps_loc.getTime() > net_loc.getTime())
-                    locationResult.gotLocation(gps_loc);
-                else
-                    locationResult.gotLocation(net_loc);
-                return;
-            }
-
-            if (gps_loc != null) {
-                locationResult.gotLocation(gps_loc);
-                return;
-            }
-            if (net_loc != null) {
-                locationResult.gotLocation(net_loc);
-                return;
-            }
-            locationResult.gotLocation(null);
-        }
-    }
-
-    public static abstract class LocationResult {
-        public abstract void gotLocation(Location location);
-    }
-
-    public void cancelTimer() {
-        if (timer1 != null) {
-            timer1.cancel();
-            lm.removeUpdates(locationListenerGps);
-            lm.removeUpdates(locationListenerNetwork);
-        }
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/MapUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/MapUtils.java
deleted file mode 100644
index 981e537d2..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/MapUtils.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.wordpress.android.util;
-
-import java.util.Date;
-import java.util.Map;
-
-/**
- * wrappers for extracting values from a Map object
- */
-public class MapUtils {
-    /*
-     * returns a String value for the passed key in the passed map
-     * always returns "" instead of null
-     */
-    public static String getMapStr(final Map<?, ?> map, final String key) {
-        if (map == null || key == null || !map.containsKey(key) || map.get(key) == null) {
-            return "";
-        }
-        return map.get(key).toString();
-    }
-
-    /*
-     * returns an int value for the passed key in the passed map
-     * defaultValue is returned if key doesn't exist or isn't a number
-     */
-    public static int getMapInt(final Map<?, ?> map, final String key) {
-        return getMapInt(map, key, 0);
-    }
-    public static int getMapInt(final Map<?, ?> map, final String key, int defaultValue) {
-        try {
-            return Integer.parseInt(getMapStr(map, key));
-        } catch (NumberFormatException e) {
-            return defaultValue;
-        }
-    }
-
-    /*
-     * long version of above
-     */
-    public static long getMapLong(final Map<?, ?> map, final String key) {
-        return getMapLong(map, key, 0);
-    }
-    public static long getMapLong(final Map<?, ?> map, final String key, long defaultValue) {
-        try {
-            return Long.parseLong(getMapStr(map, key));
-        } catch (NumberFormatException e) {
-            return defaultValue;
-        }
-    }
-
-    /*
-     * returns a date object from the passed key in the passed map
-     * returns null if key doesn't exist or isn't a date
-     */
-    public static Date getMapDate(final Map<?, ?> map, final String key) {
-        if (map==null || key==null || !map.containsKey(key))
-            return null;
-        try {
-            return (Date) map.get(key);
-        } catch (ClassCastException e) {
-            return null;
-        }
-    }
-
-    /*
-     * returns a boolean value from the passed key in the passed map
-     * returns true unless key doesn't exist, or the value is "0" or "false"
-     */
-    public static boolean getMapBool(final Map<?, ?> map, final String key) {
-        String value = getMapStr(map, key);
-        if (value.isEmpty())
-            return false;
-        if (value.startsWith("0")) // handles "0" and "0.0"
-            return false;
-        if (value.equalsIgnoreCase("false"))
-            return false;
-        // all other values are assume to be true
-        return true;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/PhotonUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/PhotonUtils.java
deleted file mode 100644
index 497d756ee..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/PhotonUtils.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.wordpress.android.util;
-
-import android.text.TextUtils;
-
-/**
- * routines related to the Photon API
- * http://developer.wordpress.com/docs/photon/
- */
-public class PhotonUtils {
-    private PhotonUtils() {
-        throw new AssertionError();
-    }
-
-    /*
-     * gravatars often contain the ?s= parameter which determines their size - detect this and
-     * replace it with a new ?s= parameter which requests the avatar at the exact size needed
-     */
-    public static String fixAvatar(final String imageUrl, int avatarSz) {
-        if (TextUtils.isEmpty(imageUrl))
-            return "";
-
-        // if this isn't a gravatar image, return as resized photon image url
-        if (!imageUrl.contains("gravatar.com"))
-            return getPhotonImageUrl(imageUrl, avatarSz, avatarSz);
-
-        // remove all other params, then add query string for size and "mystery man" default
-        return UrlUtils.removeQuery(imageUrl) + String.format("?s=%d&d=mm", avatarSz);
-    }
-
-    /*
-    * returns true if the passed url is an obvious "mshots" url
-    */
-    public static boolean isMshotsUrl(final String imageUrl) {
-        return (imageUrl != null && imageUrl.contains("/mshots/"));
-    }
-
-    /*
-     * returns a photon url for the passed image with the resize query set to the passed dimensions
-     */
-    public static String getPhotonImageUrl(String imageUrl, int width, int height) {
-        if (TextUtils.isEmpty(imageUrl)) {
-            return "";
-        }
-
-        // make sure it's valid
-        int schemePos = imageUrl.indexOf("://");
-        if (schemePos == -1) {
-            return imageUrl;
-        }
-
-        // remove existing query string since it may contain params that conflict with the passed ones
-        imageUrl = UrlUtils.removeQuery(imageUrl);
-
-        // don't use with GIFs - photon breaks animated GIFs, and sometimes returns a GIF that
-        // can't be read by BitmapFactory.decodeByteArray (used by Volley in ImageRequest.java
-        // to decode the downloaded image)
-        // ex: http://i0.wp.com/lusianne.files.wordpress.com/2013/08/193.gif?resize=768,320
-        if (imageUrl.endsWith(".gif")) {
-            return imageUrl;
-        }
-
-        // if this is an "mshots" url, skip photon and return it with a query that sets the width/height
-        // (these are screenshots of the blog that often appear in freshly pressed posts)
-        // see http://wp.tutsplus.com/tutorials/how-to-generate-website-screenshots-for-your-wordpress-site/
-        // ex: http://s.wordpress.com/mshots/v1/http%3A%2F%2Fnickbradbury.com?w=600
-        if (isMshotsUrl(imageUrl)) {
-            return imageUrl + String.format("?w=%d&h=%d", width, height);
-        }
-
-        // if both width & height are passed use the "resize" param, use only "w" or "h" if just
-        // one of them is set, otherwise no query string
-        final String query;
-        if (width > 0 && height > 0) {
-            query = String.format("?resize=%d,%d", width, height);
-        } else if (width > 0) {
-            query = String.format("?w=%d", width);
-        } else if (height > 0) {
-            query = String.format("?h=%d", height);
-        } else {
-            query = "";
-        }
-
-        // return passed url+query if it's already a photon url
-        if (imageUrl.contains(".wp.com")) {
-            if (imageUrl.contains("i0.wp.com") || imageUrl.contains("i1.wp.com") || imageUrl.contains("i2.wp.com"))
-                return imageUrl + query;
-        }
-
-        // must use https for https image urls
-        if (UrlUtils.isHttps(imageUrl)) {
-            return "https://i0.wp.com/" + imageUrl.substring(schemePos+3, imageUrl.length()) + query;
-        } else {
-            return "http://i0.wp.com/" + imageUrl.substring(schemePos+3, imageUrl.length()) + query;
-        }
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ProfilingUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ProfilingUtils.java
deleted file mode 100644
index 251db2a3b..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ProfilingUtils.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.os.SystemClock;
-
-import org.wordpress.android.util.AppLog.T;
-
-import java.util.ArrayList;
-
-/**
- * forked from android.util.TimingLogger to use AppLog instead of Log + new static interface.
- */
-public class ProfilingUtils {
-    private static ProfilingUtils sInstance;
-
-    private String mLabel;
-    private ArrayList<Long> mSplits;
-    private ArrayList<String> mSplitLabels;
-
-    public static void start(String label) {
-        getInstance().reset(label);
-    }
-
-    public static void split(String splitLabel) {
-        getInstance().addSplit(splitLabel);
-    }
-
-    public static void dump() {
-        getInstance().dumpToLog();
-    }
-
-    private static ProfilingUtils getInstance() {
-        if (sInstance == null) {
-            sInstance = new ProfilingUtils();
-        }
-        return sInstance;
-    }
-
-    public ProfilingUtils() {
-        reset("init");
-    }
-
-    public void reset(String label) {
-        mLabel = label;
-        reset();
-    }
-
-    public void reset() {
-        if (mSplits == null) {
-            mSplits = new ArrayList<Long>();
-            mSplitLabels = new ArrayList<String>();
-        } else {
-            mSplits.clear();
-            mSplitLabels.clear();
-        }
-        addSplit(null);
-    }
-
-    public void addSplit(String splitLabel) {
-        long now = SystemClock.elapsedRealtime();
-        mSplits.add(now);
-        mSplitLabels.add(splitLabel);
-    }
-
-    public void dumpToLog() {
-        AppLog.d(T.PROFILING, mLabel + ": begin");
-        final long first = mSplits.get(0);
-        long now = first;
-        for (int i = 1; i < mSplits.size(); i++) {
-            now = mSplits.get(i);
-            final String splitLabel = mSplitLabels.get(i);
-            final long prev = mSplits.get(i - 1);
-            AppLog.d(T.PROFILING, mLabel + ":      " + (now - prev) + " ms, " + splitLabel);
-        }
-        AppLog.d(T.PROFILING, mLabel + ": end, " + (now - first) + " ms");
-    }
-
-    // Returns app version name String
-    public static String getVersionName(Context context) {
-        PackageManager pm = context.getPackageManager();
-        try {
-            PackageInfo pi = pm.getPackageInfo(context.getPackageName(), 0);
-            return pi.versionName == null ? "" : pi.versionName;
-        } catch (PackageManager.NameNotFoundException e) {
-            return "";
-        }
-    }
-}
-
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/README.md b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/README.md
deleted file mode 100644
index 62a759585..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# org.wordpress.android.util
\ No newline at end of file
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SqlUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SqlUtils.java
deleted file mode 100644
index 8d1b4b437..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SqlUtils.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package org.wordpress.android.util;
-
-import android.database.Cursor;
-import android.database.DatabaseUtils;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteDoneException;
-import android.database.sqlite.SQLiteException;
-import android.database.sqlite.SQLiteStatement;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class SqlUtils {
-    private SqlUtils() {
-        throw new AssertionError();
-    }
-
-    /*
-     * SQLite doesn't have a boolean datatype, so booleans are stored as 0=false, 1=true
-     */
-    public static long boolToSql(boolean value) {
-        return (value ? 1 : 0);
-    }
-    public static boolean sqlToBool(int value) {
-        return (value != 0);
-    }
-
-    public static void closeStatement(SQLiteStatement stmt) {
-        if (stmt != null) {
-            stmt.close();
-        }
-    }
-
-    public static void closeCursor(Cursor c) {
-        if (c != null && !c.isClosed()) {
-            c.close();
-        }
-    }
-
-    /*
-     * wrapper for DatabaseUtils.longForQuery() which returns 0 if query returns no rows
-     */
-    public static long longForQuery(SQLiteDatabase db, String query, String[] selectionArgs) {
-        try {
-            return DatabaseUtils.longForQuery(db, query, selectionArgs);
-        } catch (SQLiteDoneException e) {
-            return 0;
-        }
-    }
-
-    public static int intForQuery(SQLiteDatabase db, String query, String[] selectionArgs) {
-        long value = longForQuery(db, query, selectionArgs);
-        return (int)value;
-    }
-
-    public static boolean boolForQuery(SQLiteDatabase db, String query, String[] selectionArgs) {
-        long value = longForQuery(db, query, selectionArgs);
-        return sqlToBool((int) value);
-    }
-
-    /*
-     * wrapper for DatabaseUtils.stringForQuery(), returns "" if query returns no rows
-     */
-    public static String stringForQuery(SQLiteDatabase db, String query, String[] selectionArgs) {
-        try {
-            return DatabaseUtils.stringForQuery(db, query, selectionArgs);
-        } catch (SQLiteDoneException e) {
-            return "";
-        }
-    }
-
-    /*
-     * returns the number of rows in the passed table
-     */
-    public static long getRowCount(SQLiteDatabase db, String tableName) {
-        return DatabaseUtils.queryNumEntries(db, tableName);
-    }
-
-    /*
-     * removes all rows from the passed table
-     */
-    public static void deleteAllRowsInTable(SQLiteDatabase db, String tableName) {
-        db.delete(tableName, null, null);
-    }
-
-    /*
-     * drop all tables from the passed SQLiteDatabase - make sure to pass a
-     * writable database
-     */
-    public static boolean dropAllTables(SQLiteDatabase db) throws SQLiteException {
-        if (db == null) {
-            return false;
-        }
-
-        if (db.isReadOnly()) {
-            throw new SQLiteException("can't drop tables from a read-only database");
-        }
-
-        List<String> tableNames = new ArrayList<String>();
-        Cursor cursor = db.rawQuery("SELECT name FROM sqlite_master WHERE type='table'", null);
-        if (cursor.moveToFirst()) {
-            do {
-                String tableName = cursor.getString(0);
-                if (!tableName.equals("android_metadata") && !tableName.equals("sqlite_sequence")) {
-                    tableNames.add(tableName);
-                }
-            } while (cursor.moveToNext());
-        }
-
-        db.beginTransaction();
-        try {
-            for (String tableName: tableNames) {
-                db.execSQL("DROP TABLE IF EXISTS " + tableName);
-            }
-            db.setTransactionSuccessful();
-            return true;
-        } finally {
-            db.endTransaction();
-        }
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/StringUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/StringUtils.java
deleted file mode 100644
index eca31ffd1..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/StringUtils.java
+++ /dev/null
@@ -1,278 +0,0 @@
-package org.wordpress.android.util;
-
-import android.text.Html;
-import android.text.TextUtils;
-
-import org.wordpress.android.util.AppLog.T;
-
-import java.math.BigInteger;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class StringUtils {
-    public static String[] mergeStringArrays(String array1[], String array2[]) {
-        if (array1 == null || array1.length == 0) {
-            return array2;
-        }
-        if (array2 == null || array2.length == 0) {
-            return array1;
-        }
-        List<String> array1List = Arrays.asList(array1);
-        List<String> array2List = Arrays.asList(array2);
-        List<String> result = new ArrayList<String>(array1List);
-        List<String> tmp = new ArrayList<String>(array1List);
-        tmp.retainAll(array2List);
-        result.addAll(array2List);
-        return ((String[]) result.toArray(new String[result.size()]));
-    }
-
-    public static String convertHTMLTagsForUpload(String source) {
-        // bold
-        source = source.replace("<b>", "<strong>");
-        source = source.replace("</b>", "</strong>");
-
-        // italics
-        source = source.replace("<i>", "<em>");
-        source = source.replace("</i>", "</em>");
-
-        return source;
-    }
-
-    public static String convertHTMLTagsForDisplay(String source) {
-        // bold
-        source = source.replace("<strong>", "<b>");
-        source = source.replace("</strong>", "</b>");
-
-        // italics
-        source = source.replace("<em>", "<i>");
-        source = source.replace("</em>", "</i>");
-
-        return source;
-    }
-
-    public static String addPTags(String source) {
-        String[] asploded = source.split("\n\n");
-
-        if (asploded.length > 0) {
-            StringBuilder wrappedHTML = new StringBuilder();
-            for (int i = 0; i < asploded.length; i++) {
-                String trimmed = asploded[i].trim();
-                if (trimmed.length() > 0) {
-                    trimmed = trimmed.replace("<br />", "<br>").replace("<br/>", "<br>").replace("<br>\n", "<br>")
-                                     .replace("\n", "<br>");
-                    wrappedHTML.append("<p>");
-                    wrappedHTML.append(trimmed);
-                    wrappedHTML.append("</p>");
-                }
-            }
-            return wrappedHTML.toString();
-        } else {
-            return source;
-        }
-    }
-
-    public static BigInteger getMd5IntHash(String input) {
-        try {
-            MessageDigest md = MessageDigest.getInstance("MD5");
-            byte[] messageDigest = md.digest(input.getBytes());
-            BigInteger number = new BigInteger(1, messageDigest);
-            return number;
-        } catch (NoSuchAlgorithmException e) {
-            AppLog.e(T.UTILS, e);
-            return null;
-        }
-    }
-
-    public static String getMd5Hash(String input) {
-        BigInteger number = getMd5IntHash(input);
-        String md5 = number.toString(16);
-        while (md5.length() < 32) {
-            md5 = "0" + md5;
-        }
-        return md5;
-    }
-
-    public static String unescapeHTML(String html) {
-        if (html != null) {
-            return Html.fromHtml(html).toString();
-        } else {
-            return "";
-        }
-    }
-
-    /*
-     * nbradbury - adapted from Html.escapeHtml(), which was added in API Level 16
-     * TODO: not thoroughly tested yet, so marked as private - not sure I like the way
-     * this replaces two spaces with "&nbsp;"
-     */
-    private static String escapeHtml(final String text) {
-        if (text == null) {
-            return "";
-        }
-
-        StringBuilder out = new StringBuilder();
-        int length = text.length();
-
-        for (int i = 0; i < length; i++) {
-            char c = text.charAt(i);
-
-            if (c == '<') {
-                out.append("&lt;");
-            } else if (c == '>') {
-                out.append("&gt;");
-            } else if (c == '&') {
-                out.append("&amp;");
-            } else if (c > 0x7E || c < ' ') {
-                out.append("&#").append((int) c).append(";");
-            } else if (c == ' ') {
-                while (i + 1 < length && text.charAt(i + 1) == ' ') {
-                    out.append("&nbsp;");
-                    i++;
-                }
-
-                out.append(' ');
-            } else {
-                out.append(c);
-            }
-        }
-
-        return out.toString();
-    }
-
-    /*
-     * returns empty string if passed string is null, otherwise returns passed string
-     */
-    public static String notNullStr(String s) {
-        if (s == null) {
-            return "";
-        }
-        return s;
-    }
-
-    /**
-     * returns true if two strings are equal or two strings are null
-     */
-    public static boolean equals(String s1, String s2) {
-        if (s1 == null) {
-            return s2 == null;
-        }
-        return s1.equals(s2);
-    }
-
-    /*
-     * capitalizes the first letter in the passed string - based on Apache commons/lang3/StringUtils
-     * http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java?revision=1497829&view=markup
-     */
-    public static String capitalize(final String str) {
-        int strLen;
-        if (str == null || (strLen = str.length()) == 0) {
-            return str;
-        }
-
-        char firstChar = str.charAt(0);
-        if (Character.isTitleCase(firstChar)) {
-            return str;
-        }
-
-        return new StringBuilder(strLen).append(Character.toTitleCase(firstChar)).append(str.substring(1)).toString();
-    }
-
-    /*
-     * Wrap an image URL in a photon URL
-     * Check out http://developer.wordpress.com/docs/photon/
-     */
-    public static String getPhotonUrl(String imageUrl, int size) {
-        imageUrl = imageUrl.replace("http://", "").replace("https://", "");
-        return "http://i0.wp.com/" + imageUrl + "?w=" + size;
-    }
-
-    public static String getHost(String url) {
-        if (TextUtils.isEmpty(url)) {
-            return "";
-        }
-
-        int doubleslash = url.indexOf("//");
-        if (doubleslash == -1) {
-            doubleslash = 0;
-        } else {
-            doubleslash += 2;
-        }
-
-        int end = url.indexOf('/', doubleslash);
-        end = (end >= 0) ? end : url.length();
-
-        return url.substring(doubleslash, end);
-    }
-
-    public static String replaceUnicodeSurrogateBlocksWithHTMLEntities(final String inputString) {
-        final int length = inputString.length();
-        StringBuilder out = new StringBuilder(); // Used to hold the output.
-        for (int offset = 0; offset < length; ) {
-            final int codepoint = inputString.codePointAt(offset);
-            final char current = inputString.charAt(offset);
-            if (Character.isHighSurrogate(current) || Character.isLowSurrogate(current)) {
-                if (Emoticons.wpSmiliesCodePointToText.get(codepoint) != null) {
-                    out.append(Emoticons.wpSmiliesCodePointToText.get(codepoint));
-                } else {
-                    final String htmlEscapedChar = "&#x" + Integer.toHexString(codepoint) + ";";
-                    out.append(htmlEscapedChar);
-                }
-            } else {
-                out.append(current);
-            }
-            offset += Character.charCount(codepoint);
-        }
-        return out.toString();
-    }
-
-    /**
-     * This method ensures that the output String has only
-     * valid XML unicode characters as specified by the
-     * XML 1.0 standard. For reference, please see
-     * <a href="http://www.w3.org/TR/2000/REC-xml-20001006#NT-Char">the
-     * standard</a>. This method will return an empty
-     * String if the input is null or empty.
-     *
-     * @param in The String whose non-valid characters we want to remove.
-     * @return The in String, stripped of non-valid characters.
-     */
-    public static final String stripNonValidXMLCharacters(String in) {
-        StringBuilder out = new StringBuilder(); // Used to hold the output.
-        char current; // Used to reference the current character.
-
-        if (in == null || ("".equals(in))) {
-            return ""; // vacancy test.
-        }
-        for (int i = 0; i < in.length(); i++) {
-            current = in.charAt(i); // NOTE: No IndexOutOfBoundsException caught here; it should not happen.
-            if ((current == 0x9) ||
-                (current == 0xA) ||
-                (current == 0xD) ||
-                ((current >= 0x20) && (current <= 0xD7FF)) ||
-                ((current >= 0xE000) && (current <= 0xFFFD)) ||
-                ((current >= 0x10000) && (current <= 0x10FFFF))) {
-                out.append(current);
-            }
-        }
-        return out.toString();
-    }
-
-    /*
-     * simple wrapper for Integer.valueOf(string) so caller doesn't need to catch NumberFormatException
-     */
-    public static int stringToInt(String s) {
-        return stringToInt(s, 0);
-    }
-    public static int stringToInt(String s, int defaultValue) {
-        if (s == null)
-            return defaultValue;
-        try {
-            return Integer.valueOf(s);
-        } catch (NumberFormatException e) {
-            return defaultValue;
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SystemServiceFactory.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SystemServiceFactory.java
deleted file mode 100644
index 4ba0c96ed..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SystemServiceFactory.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.Context;
-
-import org.wordpress.android.util.AppLog.T;
-
-public class SystemServiceFactory {
-    public static SystemServiceFactoryAbstract sFactory;
-
-    public static Object get(Context context, String name) {
-        if (sFactory == null) {
-            sFactory = new SystemServiceFactoryDefault();
-        }
-        AppLog.v(T.UTILS, "instantiate SystemService using sFactory: " + sFactory.getClass());
-        return sFactory.get(context, name);
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SystemServiceFactoryAbstract.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SystemServiceFactoryAbstract.java
deleted file mode 100644
index a9d522db4..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SystemServiceFactoryAbstract.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.Context;
-
-public interface SystemServiceFactoryAbstract {
-    public Object get(Context context, String name);
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SystemServiceFactoryDefault.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SystemServiceFactoryDefault.java
deleted file mode 100644
index eb488dde9..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SystemServiceFactoryDefault.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.Context;
-
-public class SystemServiceFactoryDefault implements SystemServiceFactoryAbstract {
-    public Object get(Context context, String name) {
-        return context.getSystemService(name);
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ToastUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ToastUtils.java
deleted file mode 100644
index 9b99c6ea5..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ToastUtils.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.Context;
-import android.view.Gravity;
-import android.widget.Toast;
-
-/**
- * Provides a simplified way to show toast messages without having to create the toast, set the
- * desired gravity, etc.
- */
-public class ToastUtils {
-    public enum Duration {SHORT, LONG}
-
-    private ToastUtils() {
-        throw new AssertionError();
-    }
-
-    public static Toast showToast(Context context, int stringResId) {
-        return showToast(context, stringResId, Duration.SHORT);
-    }
-
-    public static Toast showToast(Context context, int stringResId, Duration duration) {
-        return showToast(context, context.getString(stringResId), duration);
-    }
-
-    public static Toast showToast(Context context, String text) {
-        return showToast(context, text, Duration.SHORT);
-    }
-
-    public static Toast showToast(Context context, String text, Duration duration) {
-        Toast toast = Toast.makeText(context, text,
-                (duration == Duration.SHORT ? Toast.LENGTH_SHORT : Toast.LENGTH_LONG));
-        toast.setGravity(Gravity.CENTER, 0, 0);
-        toast.show();
-        return toast;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/UrlUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/UrlUtils.java
deleted file mode 100644
index 4438b8950..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/UrlUtils.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package org.wordpress.android.util;
-
-import android.net.Uri;
-import android.webkit.MimeTypeMap;
-import android.webkit.URLUtil;
-
-import java.io.UnsupportedEncodingException;
-import java.net.IDN;
-import java.net.URI;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.nio.charset.Charset;
-
-public class UrlUtils {
-    public static String urlEncode(final String text) {
-        try {
-            return URLEncoder.encode(text, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            return text;
-        }
-    }
-
-    public static String urlDecode(final String text) {
-        try {
-            return URLDecoder.decode(text, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            return text;
-        }
-    }
-
-    public static String getDomainFromUrl(final String urlString) {
-        if (urlString == null) {
-            return "";
-        }
-        Uri uri = Uri.parse(urlString);
-        return uri.getHost();
-    }
-
-    /**
-     * Convert IDN names to punycode if necessary
-     */
-    public static String convertUrlToPunycodeIfNeeded(String url) {
-        if (!Charset.forName("US-ASCII").newEncoder().canEncode(url)) {
-            if (url.toLowerCase().startsWith("http://")) {
-                url = "http://" + IDN.toASCII(url.substring(7));
-            } else if (url.toLowerCase().startsWith("https://")) {
-                url = "https://" + IDN.toASCII(url.substring(8));
-            } else {
-                url = IDN.toASCII(url);
-            }
-        }
-        return url;
-    }
-
-    public static String addUrlSchemeIfNeeded(String url, boolean isHTTPS) {
-        if (url == null) {
-            return null;
-        }
-
-        if (!URLUtil.isValidUrl(url)) {
-            if (!(url.toLowerCase().startsWith("http://")) && !(url.toLowerCase().startsWith("https://"))) {
-                url = (isHTTPS ? "https" : "http") + "://" + url;
-            }
-        }
-
-        return url;
-    }
-
-    /**
-     * normalizes a URL, primarily for comparison purposes, for example so that
-     * normalizeUrl("http://google.com/") = normalizeUrl("http://google.com")
-     */
-    public static String normalizeUrl(final String urlString) {
-        if (urlString == null) {
-            return null;
-        }
-
-        // this routine is called from some performance-critical code and creating a URI from a string
-        // is slow, so skip it when possible - if we know it's not a relative path (and 99.9% of the
-        // time it won't be for our purposes) then we can normalize it without java.net.URI.normalize()
-        if (urlString.startsWith("http") && !urlString.contains("build/intermediates/exploded-aar/org.wordpress/graphview/3.1.1")) {
-            // return without a trailing slash
-            if (urlString.endsWith("/")) {
-                return urlString.substring(0, urlString.length() - 1);
-            }
-            return urlString;
-        }
-
-        // url is relative, so fall back to using slower java.net.URI normalization
-        try {
-            URI uri = URI.create(urlString);
-            return uri.normalize().toString();
-        } catch (IllegalArgumentException e) {
-            return urlString;
-        }
-    }
-
-    /**
-     * returns the passed url without the query parameters
-     */
-    public static String removeQuery(final String urlString) {
-        if (urlString == null) {
-            return null;
-        }
-        int pos = urlString.indexOf("?");
-        if (pos == -1) {
-            return urlString;
-        }
-        return urlString.substring(0, pos);
-    }
-
-    /**
-     * returns true if passed url is https:
-     */
-    public static boolean isHttps(final String urlString) {
-        return (urlString != null && urlString.startsWith("https:"));
-    }
-
-    /**
-     * returns https: version of passed http: url
-     */
-    public static String makeHttps(final String urlString) {
-        if (urlString == null || !urlString.startsWith("http:")) {
-            return urlString;
-        }
-        return "https:" + urlString.substring(5, urlString.length());
-    }
-
-    /**
-     * see http://stackoverflow.com/a/8591230/1673548
-     */
-    public static String getUrlMimeType(final String urlString) {
-        if (urlString == null) {
-            return null;
-        }
-
-        String extension = MimeTypeMap.getFileExtensionFromUrl(urlString);
-        if (extension == null) {
-            return null;
-        }
-
-        MimeTypeMap mime = MimeTypeMap.getSingleton();
-        String mimeType = mime.getMimeTypeFromExtension(extension);
-        if (mimeType == null) {
-            return null;
-        }
-
-        return mimeType;
-    }
-
-    /**
-     * returns false if the url is not valid or if the url host is null, else true
-     */
-    public static boolean isValidUrlAndHostNotNull(String url) {
-        try {
-            URI uri = URI.create(url);
-            if (uri.getHost() == null) {
-                return false;
-            }
-        } catch (IllegalArgumentException e) {
-            return false;
-        }
-        return true;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/UserEmail.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/UserEmail.java
deleted file mode 100644
index dae02b4f0..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/UserEmail.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.wordpress.android.util;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.content.Context;
-import android.util.Patterns;
-
-import java.util.regex.Pattern;
-
-public class UserEmail {
-    /**
-     * Get primary account and return its name if it matches the email address pattern.
-     *
-     * @return primary account email address if it can be found or empty string else.
-     */
-    public static String getPrimaryEmail(Context context) {
-        try {
-            AccountManager accountManager = AccountManager.get(context);
-            if (accountManager == null)
-                return "";
-            Account[] accounts = accountManager.getAccounts();
-            Pattern emailPattern = Patterns.EMAIL_ADDRESS;
-            for (Account account : accounts) {
-                // make sure account.name is an email address before adding to the list
-                if (emailPattern.matcher(account.name).matches()) {
-                    return account.name;
-                }
-            }
-            return "";
-        } catch (SecurityException e) {
-            // exception will occur if app doesn't have GET_ACCOUNTS permission
-            return "";
-        }
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/Version.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/Version.java
deleted file mode 100644
index 6e695db45..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/Version.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.wordpress.android.util;
-
-//See: http://stackoverflow.com/a/11024200
-public class Version implements Comparable<Version> {
-    private String version;
-
-    public final String get() {
-        return this.version;
-    }
-
-    public Version(String version) {
-        if(version == null)
-            throw new IllegalArgumentException("Version can not be null");
-        if(!version.matches("[0-9]+(\\.[0-9]+)*"))
-            throw new IllegalArgumentException("Invalid version format");
-        this.version = version;
-    }
-
-    @Override public int compareTo(Version that) {
-        if(that == null)
-            return 1;
-        String[] thisParts = this.get().split("\\.");
-        String[] thatParts = that.get().split("\\.");
-        int length = Math.max(thisParts.length, thatParts.length);
-        for(int i = 0; i < length; i++) {
-            int thisPart = i < thisParts.length ?
-                Integer.parseInt(thisParts[i]) : 0;
-            int thatPart = i < thatParts.length ?
-                Integer.parseInt(thatParts[i]) : 0;
-            if(thisPart < thatPart)
-                return -1;
-            if(thisPart > thatPart)
-                return 1;
-        }
-        return 0;
-    }
-
-    @Override public boolean equals(Object that) {
-        if(this == that)
-            return true;
-        if(that == null)
-            return false;
-        if(this.getClass() != that.getClass())
-            return false;
-        return this.compareTo((Version) that) == 0;
-    }
-}
\ No newline at end of file
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/WPHtmlTagHandler.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/WPHtmlTagHandler.java
deleted file mode 100644
index fa96a998a..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/WPHtmlTagHandler.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.wordpress.android.util;
-
-import android.text.Editable;
-import android.text.Html;
-import android.text.style.BulletSpan;
-import android.text.style.LeadingMarginSpan;
-
-import org.xml.sax.XMLReader;
-
-import java.util.Vector;
-
-/**
- * Handle tags that the Html class doesn't understand
- * Tweaked from source at http://stackoverflow.com/questions/4044509/android-how-to-use-the-html-taghandler
- */
-public class WPHtmlTagHandler implements Html.TagHandler {
-    private int mListItemCount = 0;
-    private Vector<String> mListParents = new Vector<String>();
-
-    @Override
-    public void handleTag(final boolean opening, final String tag, Editable output,
-                          final XMLReader xmlReader) {
-        if (tag.equals("ul") || tag.equals("ol") || tag.equals("dd")) {
-            if (opening) {
-                mListParents.add(tag);
-            } else {
-                mListParents.remove(tag);
-            }
-            mListItemCount = 0;
-        } else if (tag.equals("li") && !opening) {
-            handleListTag(output);
-        }
-    }
-
-    private void handleListTag(Editable output) {
-        if (mListParents.lastElement().equals("ul")) {
-            output.append("\n");
-            String[] split = output.toString().split("\n");
-            int start = 0;
-            if (split.length != 1) {
-                int lastIndex = split.length - 1;
-                start = output.length() - split[lastIndex].length() - 1;
-            }
-            output.setSpan(new BulletSpan(15 * mListParents.size()), start, output.length(), 0);
-        } else if (mListParents.lastElement().equals("ol")) {
-            mListItemCount++;
-            output.append("\n");
-            String[] split = output.toString().split("\n");
-            int start = 0;
-            if (split.length != 1) {
-                int lastIndex = split.length - 1;
-                start = output.length() - split[lastIndex].length() - 1;
-            }
-            output.insert(start, mListItemCount + ". ");
-            output.setSpan(new LeadingMarginSpan.Standard(15 * mListParents.size()), start,
-                    output.length(), 0);
-        }
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/WPImageGetter.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/WPImageGetter.java
deleted file mode 100644
index 60b0d605b..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/WPImageGetter.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package org.wordpress.android.util;
-
-import android.graphics.Canvas;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.text.Html;
-import android.text.TextUtils;
-import android.widget.TextView;
-
-import com.android.volley.VolleyError;
-import com.android.volley.toolbox.ImageLoader;
-
-import org.wordpress.android.util.AppLog.T;
-
-import java.lang.ref.WeakReference;
-
-/**
- * ImageGetter for Html.fromHtml()
- * adapted from existing ImageGetter code in NoteCommentFragment
- */
-public class WPImageGetter implements Html.ImageGetter {
-    private WeakReference<TextView> mWeakView;
-    private int mMaxSize;
-    private ImageLoader mImageLoader;
-    private Drawable mLoadingDrawable;
-    private Drawable mFailedDrawable;
-
-    public WPImageGetter(TextView view) {
-        this(view, 0);
-    }
-
-    public WPImageGetter(TextView view, int maxSize) {
-        mWeakView = new WeakReference<TextView>(view);
-        mMaxSize = maxSize;
-    }
-
-    public WPImageGetter(TextView view, int maxSize, ImageLoader imageLoader, Drawable loadingDrawable,
-                         Drawable failedDrawable) {
-        mWeakView = new WeakReference<TextView>(view);
-        mMaxSize = maxSize;
-        mImageLoader = imageLoader;
-        mLoadingDrawable = loadingDrawable;
-        mFailedDrawable = failedDrawable;
-    }
-
-    public void setImageLoader(ImageLoader imageLoader) {
-        mImageLoader = imageLoader;
-    }
-
-    public void setLoadingDrawable(Drawable loadingDrawable) {
-        mLoadingDrawable = loadingDrawable;
-    }
-
-    public void setFailedDrawable(Drawable failedDrawable) {
-        mFailedDrawable = failedDrawable;
-    }
-
-    private TextView getView() {
-        return mWeakView.get();
-    }
-
-    @Override
-    public Drawable getDrawable(String source) {
-        if (mImageLoader == null || mLoadingDrawable == null || mFailedDrawable == null) {
-            throw new RuntimeException("Developer, you need to call setImageLoader, setLoadingDrawable and setFailedDrawable");
-        }
-
-        if (TextUtils.isEmpty(source)) {
-            return null;
-        }
-
-        // images in reader comments may skip "http:" (no idea why) so make sure to add protocol here
-        if (source.startsWith("//")) {
-            source = "http:" + source;
-        }
-
-        // use Photon if a max size is requested (otherwise the full-sized image will be downloaded
-        // and then resized)
-        if (mMaxSize > 0) {
-            source = PhotonUtils.getPhotonImageUrl(source, mMaxSize, 0);
-        }
-
-        TextView view = getView();
-        // Drawable loading = view.getContext().getResources().getDrawable(R.drawable.remote_image); FIXME: here
-        // Drawable failed = view.getContext().getResources().getDrawable(R.drawable.remote_failed);
-        final RemoteDrawable remote = new RemoteDrawable(mLoadingDrawable, mFailedDrawable);
-
-        mImageLoader.get(source, new ImageLoader.ImageListener() {
-            @Override
-            public void onErrorResponse(VolleyError error) {
-                remote.displayFailed();
-                TextView view = getView();
-                if (view != null) {
-                    view.invalidate();
-                }
-            }
-
-            @Override
-            public void onResponse(ImageLoader.ImageContainer response, boolean isImmediate) {
-                if (response.getBitmap() != null) {
-                    // make sure view is still valid
-                    TextView view = getView();
-                    if (view == null) {
-                        AppLog.w(T.UTILS, "WPImageGetter view is invalid");
-                        return;
-                    }
-
-                    Drawable drawable = new BitmapDrawable(view.getContext().getResources(), response.getBitmap());
-                    final int oldHeight = remote.getBounds().height();
-                    int maxWidth = view.getWidth() - view.getPaddingLeft() - view.getPaddingRight();
-                    if (mMaxSize > 0 && (maxWidth > mMaxSize || maxWidth == 0)) {
-                        maxWidth = mMaxSize;
-                    }
-                    remote.setRemoteDrawable(drawable, maxWidth);
-
-                    // image is from cache? don't need to modify view height
-                    if (isImmediate) {
-                        return;
-                    }
-
-                    int newHeight = remote.getBounds().height();
-                    view.invalidate();
-                    // For ICS
-                    view.setHeight(view.getHeight() + newHeight - oldHeight);
-                    // Pre ICS
-                    view.setEllipsize(null);
-                }
-            }
-        });
-        return remote;
-    }
-
-    private static class RemoteDrawable extends BitmapDrawable {
-        protected Drawable mRemoteDrawable;
-        protected Drawable mLoadingDrawable;
-        protected Drawable mFailedDrawable;
-        private boolean mDidFail = false;
-
-        public RemoteDrawable(Drawable loadingDrawable, Drawable failedDrawable) {
-            mLoadingDrawable = loadingDrawable;
-            mFailedDrawable = failedDrawable;
-            setBounds(0, 0, mLoadingDrawable.getIntrinsicWidth(), mLoadingDrawable.getIntrinsicHeight());
-        }
-
-        public void displayFailed() {
-            mDidFail = true;
-        }
-
-        public void setBounds(int x, int y, int width, int height) {
-            super.setBounds(x, y, width, height);
-            if (mRemoteDrawable != null) {
-                mRemoteDrawable.setBounds(x, y, width, height);
-                return;
-            }
-            if (mLoadingDrawable != null) {
-                mLoadingDrawable.setBounds(x, y, width, height);
-                mFailedDrawable.setBounds(x, y, width, height);
-            }
-        }
-
-        public void setRemoteDrawable(Drawable remote) {
-            mRemoteDrawable = remote;
-            setBounds(0, 0, mRemoteDrawable.getIntrinsicWidth(), mRemoteDrawable.getIntrinsicHeight());
-        }
-
-        public void setRemoteDrawable(Drawable remote, int maxWidth) {
-            // null sentinel for now
-            if (remote == null) {
-                // throw error
-                return;
-            }
-            mRemoteDrawable = remote;
-            // determine if we need to scale the image to fit in view
-            int imgWidth = remote.getIntrinsicWidth();
-            int imgHeight = remote.getIntrinsicHeight();
-            float xScale = (float) imgWidth / (float) maxWidth;
-            if (xScale > 1.0f) {
-                setBounds(0, 0, Math.round(imgWidth / xScale), Math.round(imgHeight / xScale));
-            } else {
-                setBounds(0, 0, imgWidth, imgHeight);
-            }
-        }
-
-        public boolean didFail() {
-            return mDidFail;
-        }
-
-        public void draw(Canvas canvas) {
-            if (mRemoteDrawable != null) {
-                mRemoteDrawable.draw(canvas);
-            } else if (didFail()) {
-                mFailedDrawable.draw(canvas);
-            } else {
-                mLoadingDrawable.draw(canvas);
-            }
-        }
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/WPQuoteSpan.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/WPQuoteSpan.java
deleted file mode 100644
index 37d5dfe6d..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/WPQuoteSpan.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.wordpress.android.util;
-
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.text.Layout;
-import android.text.style.QuoteSpan;
-
-/**
- * Customzed QuoteSpan for use in SpannableString's
- */
-public class WPQuoteSpan extends QuoteSpan {
-    public static final int STRIPE_COLOR = 0xFF21759B;
-    private static final int STRIPE_WIDTH = 5;
-    private static final int GAP_WIDTH = 20;
-
-    public WPQuoteSpan(){
-        super(STRIPE_COLOR);
-    }
-
-    @Override
-    public int getLeadingMargin(boolean first) {
-        int margin = GAP_WIDTH * 2 + STRIPE_WIDTH;
-        return margin;
-    }
-
-    /**
-     * Draw a nice thick gray bar if Ice Cream Sandwhich or newer. There's a
-     * bug on older devices that does not respect the increased margin.
-     */
-    @Override
-    public void drawLeadingMargin(Canvas c, Paint p, int x, int dir, int top, int baseline, int bottom,
-                                  CharSequence text, int start, int end, boolean first, Layout layout) {
-        Paint.Style style = p.getStyle();
-        int color = p.getColor();
-
-        p.setStyle(Paint.Style.FILL);
-        p.setColor(STRIPE_COLOR);
-
-        c.drawRect(GAP_WIDTH + x, top, x + dir * STRIPE_WIDTH, bottom, p);
-
-        p.setStyle(style);
-        p.setColor(color);
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/WPWebChromeClient.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/WPWebChromeClient.java
deleted file mode 100644
index 6a40c6f38..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/WPWebChromeClient.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.wordpress.android.util;
-
-import android.app.Activity;
-import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebView;
-import android.widget.ProgressBar;
-
-public class WPWebChromeClient extends WebChromeClient {
-    private ProgressBar mProgressBar;
-    private Activity mActivity;
-
-    public WPWebChromeClient(Activity activity, ProgressBar progressBar) {
-        mProgressBar = progressBar;
-        mActivity = activity;
-    }
-
-    public void onProgressChanged(WebView webView, int progress) {
-        if (!mActivity.isFinishing()) {
-            mActivity.setTitle(webView.getTitle());
-        }
-        if (progress == 100) {
-            mProgressBar.setVisibility(View.GONE);
-        } else {
-            mProgressBar.setVisibility(View.VISIBLE);
-            mProgressBar.setProgress(progress);
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ptr/PullToRefreshHeaderTransformer.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ptr/PullToRefreshHeaderTransformer.java
deleted file mode 100644
index 3fec8d91f..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ptr/PullToRefreshHeaderTransformer.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.wordpress.android.util.ptr;
-
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
-import android.app.Activity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.animation.Animation;
-
-import org.wordpress.android.util.R;
-
-import uk.co.senab.actionbarpulltorefresh.library.DefaultHeaderTransformer;
-import uk.co.senab.actionbarpulltorefresh.library.sdk.Compat;
-
-public class PullToRefreshHeaderTransformer extends DefaultHeaderTransformer {
-    private View mHeaderView;
-    private ViewGroup mContentLayout;
-    private long mAnimationDuration;
-    private boolean mShowProgressBarOnly;
-    private Animation mHeaderOutAnimation;
-    private OnTopScrollChangedListener mOnTopScrollChangedListener;
-
-    public interface OnTopScrollChangedListener {
-        public void onTopScrollChanged(boolean scrolledOnTop);
-    }
-
-    public void setShowProgressBarOnly(boolean progressBarOnly) {
-        mShowProgressBarOnly = progressBarOnly;
-    }
-
-    @Override
-    public void onViewCreated(Activity activity, View headerView) {
-        super.onViewCreated(activity, headerView);
-        mHeaderView = headerView;
-        mContentLayout = (ViewGroup) headerView.findViewById(R.id.ptr_content);
-        mAnimationDuration = activity.getResources().getInteger(android.R.integer.config_shortAnimTime);
-    }
-
-    @Override
-    public boolean hideHeaderView() {
-        mShowProgressBarOnly = false;
-        return super.hideHeaderView();
-    }
-
-    @Override
-    public boolean showHeaderView() {
-        // Workaround to avoid this bug https://github.com/chrisbanes/ActionBar-PullToRefresh/issues/265
-        // Note, that also remove the alpha animation
-        resetContentLayoutAlpha();
-
-        boolean changeVis = mHeaderView.getVisibility() != View.VISIBLE;
-        mContentLayout.setVisibility(View.VISIBLE);
-        if (changeVis) {
-            mHeaderView.setVisibility(View.VISIBLE);
-            AnimatorSet animSet = new AnimatorSet();
-            ObjectAnimator alphaAnim = ObjectAnimator.ofFloat(mHeaderView, "alpha", 0f, 1f);
-            ObjectAnimator transAnim = ObjectAnimator.ofFloat(mContentLayout, "translationY",
-                    -mContentLayout.getHeight(), 10f);
-            animSet.playTogether(transAnim, alphaAnim);
-            animSet.play(alphaAnim);
-            animSet.setDuration(mAnimationDuration);
-            animSet.start();
-            if (mShowProgressBarOnly) {
-                mContentLayout.setVisibility(View.INVISIBLE);
-            }
-        }
-        return changeVis;
-    }
-
-    @Override
-    public void onPulled(float percentagePulled) {
-        super.onPulled(percentagePulled);
-    }
-
-    private void resetContentLayoutAlpha() {
-        Compat.setAlpha(mContentLayout, 1f);
-    }
-
-    @Override
-    public void onReset() {
-        super.onReset();
-        // Reset the Content Layout
-        if (mContentLayout != null) {
-            Compat.setAlpha(mContentLayout, 1f);
-            mContentLayout.setVisibility(View.VISIBLE);
-        }
-    }
-
-    @Override
-    public void onTopScrollChanged(boolean scrolledOnTop) {
-        if (mOnTopScrollChangedListener != null) {
-            mOnTopScrollChangedListener.onTopScrollChanged(scrolledOnTop);
-        }
-    }
-
-    public void setOnTopScrollChangedListener(OnTopScrollChangedListener listener) {
-        mOnTopScrollChangedListener = listener;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ptr/PullToRefreshHelper.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ptr/PullToRefreshHelper.java
deleted file mode 100644
index 3c7b46619..000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ptr/PullToRefreshHelper.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package org.wordpress.android.util.ptr;
-
-import android.app.Activity;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.preference.PreferenceManager;
-import android.support.v4.content.LocalBroadcastManager;
-import android.view.View;
-
-import org.wordpress.android.util.R;
-import org.wordpress.android.util.ToastUtils;
-import org.wordpress.android.util.ToastUtils.Duration;
-
-import java.lang.ref.WeakReference;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import uk.co.senab.actionbarpulltorefresh.library.ActionBarPullToRefresh;
-import uk.co.senab.actionbarpulltorefresh.library.ActionBarPullToRefresh.SetupWizard;
-import uk.co.senab.actionbarpulltorefresh.library.Options;
-import uk.co.senab.actionbarpulltorefresh.library.PullToRefreshLayout;
-import uk.co.senab.actionbarpulltorefresh.library.listeners.OnRefreshListener;
-import uk.co.senab.actionbarpulltorefresh.library.viewdelegates.ViewDelegate;
-
-public class PullToRefreshHelper implements OnRefreshListener {
-    public static final String BROADCAST_ACTION_REFRESH_MENU_PRESSED = "REFRESH_MENU_PRESSED";
-    private static final String REFRESH_BUTTON_HIT_COUNT = "REFRESH_BUTTON_HIT_COUNT";
-    private static final Set<Integer> TOAST_FREQUENCY = new HashSet<Integer>(Arrays.asList(1, 5, 10, 20, 40, 80, 160,
-            320, 640));
-    private PullToRefreshHeaderTransformer mHeaderTransformer;
-    private PullToRefreshLayout mPullToRefreshLayout;
-    private RefreshListener mRefreshListener;
-    private WeakReference<Activity> mActivityRef;
-
-    public PullToRefreshHelper(Activity activity, PullToRefreshLayout pullToRefreshLayout, RefreshListener listener) {
-        init(activity, pullToRefreshLayout, listener, null);
-    }
-
-    public PullToRefreshHelper(Activity activity, PullToRefreshLayout pullToRefreshLayout, RefreshListener listener,
-                               java.lang.Class<?> viewClass) {
-        init(activity, pullToRefreshLayout, listener, viewClass);
-    }
-
-    public void init(Activity activity, PullToRefreshLayout pullToRefreshLayout, RefreshListener listener,
-                     java.lang.Class<?> viewClass) {
-        mActivityRef = new WeakReference<Activity>(activity);
-        mRefreshListener = listener;
-        mPullToRefreshLayout = pullToRefreshLayout;
-        mHeaderTransformer = new PullToRefreshHeaderTransformer();
-        SetupWizard setupWizard = ActionBarPullToRefresh.from(activity).options(Options.create().headerTransformer(
-                mHeaderTransformer).build()).allChildrenArePullable().listener(this);
-        if (viewClass != null) {
-            setupWizard.useViewDelegate(viewClass, new ViewDelegate() {
-                        @Override
-                        public boolean isReadyForPull(View view, float v, float v2) {
-                            return true;
-                        }
-                    }
-            );
-        }
-        setupWizard.setup(mPullToRefreshLayout);
-    }
-
-    public void setRefreshing(boolean refreshing) {
-        mHeaderTransformer.setShowProgressBarOnly(refreshing);
-        mPullToRefreshLayout.setRefreshing(refreshing);
-    }
-
-    public boolean isRefreshing() {
-        return mPullToRefreshLayout.isRefreshing();
-    }
-
-    @Override
-    public void onRefreshStarted(View view) {
-        mRefreshListener.onRefreshStarted(view);
-    }
-
-    public interface RefreshListener {
-        public void onRefreshStarted(View view);
-    }
-
-    public void setEnabled(boolean enabled) {
-        mPullToRefreshLayout.setEnabled(enabled);
-    }
-
-    public void refreshAction() {
-        Activity activity = mActivityRef.get();
-        if (activity == null) {
-            return;
-        }
-        setRefreshing(true);
-        mRefreshListener.onRefreshStarted(mPullToRefreshLayout);
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
-        int refreshHits = preferences.getInt(REFRESH_BUTTON_HIT_COUNT, 0);
-        refreshHits += 1;
-        if (TOAST_FREQUENCY.contains(refreshHits)) {
-            ToastUtils.showToast(activity, R.string.ptr_tip_message, Duration.LONG);
-        }
-        Editor editor = preferences.edit();
-        editor.putInt(REFRESH_BUTTON_HIT_COUNT, refreshHits);
-        editor.commit();
-    }
-
-    public void registerReceiver(Context context) {
-        if (context == null) {
-            return;
-        }
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(BROADCAST_ACTION_REFRESH_MENU_PRESSED);
-        LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
-        lbm.registerReceiver(mReceiver, filter);
-    }
-
-    public void unregisterReceiver(Context context) {
-        if (context == null) {
-            return;
-        }
-        try {
-            LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
-            lbm.unregisterReceiver(mReceiver);
-        } catch (IllegalArgumentException e) {
-            // exception occurs if receiver already unregistered (safe to ignore)
-        }
-    }
-
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (intent == null || intent.getAction() == null) {
-                return;
-            }
-            if (intent.getAction().equals(BROADCAST_ACTION_REFRESH_MENU_PRESSED)) {
-                refreshAction();
-            }
-        }
-    };
-}
diff --git a/libs/utils/WordPressUtils/src/main/res/values/strings.xml b/libs/utils/WordPressUtils/src/main/res/values/strings.xml
deleted file mode 100644
index 2061ba880..000000000
--- a/libs/utils/WordPressUtils/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="ptr_tip_message">Tip: Pull down to refresh</string>
-</resources>