Clean up old non-used variables