Get rid of some unused variables