Removed some variables that were no longer used.