Android Studio cleanups