Cleanup of the ExtendSelector and other widgets