Improved cleanup for renderedElements of views
1.20.4