Disable recovery/charge_only checking
Cleanup part 1