(Android frontend) Cleanup