Removed more unused variables.