Remove unused vars
No real change