fix when remove can have implications from root model to sub models
(cherry picked from commit 07010ca74af5e6672fba63437c1fe09b9ab4da75)