Place unset logic in unset_prop