remove unneeded variables
6 files changed