Cleanup with Android Studio 3