AICPfy the tree and remove unwanted overlays