Get rid of unnecessary vars