Get rid of some excessive variables