Remove data that should should not be stored in extra_data