Remove unused variables that crept in.