unneeded vars removed