Removing
Refactoring to Vaadin7