Remove some temporary variables