cleanup of various files relating to the charge_state code rework