Clean up for Android Studio V3
Clean up for Android Studio V4