More code cleanup from Android Studio. :-)