Issue#152 widget cleanup