Useless vars removed