Remove left overs from widget handling