Removed some old unused variables.