Remove some unused locals