[KitKat] Cleanup