Finally add back the depenendent destroy stuff