cleanup after widgets refactoring