Hack around 12774
Remove unused and shadowing variable
More updates