Get code working again as before, some small cleanup

@Timethor, when using non-custom biomes in the WorldBiomes folder, an
error is displayed about duplicate biome ids. I checked for it, this was
already the case before this merge.