removed cruft from vars