Remove some unused methods.
Reformat test code in Android Studio.