Do not call unset disc. upon subshell cleanup or running a script

Do not call unset disc. upon subshell cleanup or running a script #2206