remove all references to WidgetDescriptor