Removing more unused variables.