WorldDatabase removed.

+ Some tidying.