Clean up world generation code.
Reimplement respawning.