Removed has_any_keys_to_save method from custom_data
Don't simple reference custom data
Code simplification