Some APK cleanup