Remove unneeded unset calls

1854508a40bb3611e49bdee8304e0d7c7d2889ae