Move clean up of widget to pushToWidget