Remove action_type and action_id