add unset helper.
Merge branch 'unset_helper'