Moving to pure-Vaadin, part 2