Clean up for Android Studio
Clean up for Android Studio