Cleanup
Fix charging animation