Removed last traces of ignore_charges