added APK and auto-cleaned code