[cvs-nhc98] Refactor, changing Unset command to Set. Also add vanishi