Remove some unused variables