Fix battery issue(WIP)
Remove unused file