Got rid of some unused variables.