remove obsolete unset()
fix comment typo