Remove some unused vars