More cleanup

- Removed most uses of WorldDatabase...