useless vars removed