(Android frontend) Cleanups