Remove some unneeded unset() calls