Remove unneeded unset calls