respawn and cleanup changes