Clean up old variables