Get rid of superfluous variables