Android Studio cleanup