Remove some use of charge groups from domdec