Remove some unused variables
Remove some unused and undefined variables