@mattab The two mentioned widgets are now removed as well. Everything else shouldn't be handled in this PR. It's only one step towards solving #6324. It's better to keep pull requests simple and small, so they can be easily merged. So maybe add your other comment in that issue.