(Android) Cleanups