Cleanup with Android Studio