Clean up at least vcl + what depends on that, but unfortunately there are
still some "Closer"'s left elsewhere...

Change-Id: I019c863d07ee62d701ff01c8d871334012c105f1