Remove some more variable references