Removed old unused variables.