Android: final cleanup