Changes related to refactoring de-widgets.