Clean up vars.

1 job for master in 28 minutes and 35 seconds