Remove some shadowing variables