Charger related cleanup