Clean up unnecessary variables