don't save variables if they are not used anywhere else

don't save variables if they are not used anywhere else #5633