Invulnerability on respawn, more cleanup