Fix removeWidgets