LPS-48810

More fixes to destroy logic