Update "mega var cleanup"