Fixed some merge issues

Temporarily uncommented the deletion of all the transform children of
zombie as soon as it dies