got rid of some unused variables.