Merge "Cleanup old idle variables"