Cleanup with Android Studio 2