widgets: common: clean-up