Removing this stuff as it will be dealt with in BatteryManager