Get rid of unnecessary variables