Fixes removal of views and child views