(Android) small cleanups