clean up world code