Cleanup for Android 4.3