[HELIX-132] current-state and external-view are not cleaned up when a resource has been removed, rb=21666