Follow up a7d421274b308f7d9cc4ac39935beae851b29b97

Ensured same vars are also cleared upon shutdown.

Signed-off-by: shennetsind <ind@henn.et>