Leftover var removal