Continue worldgen code cleanup
Item code cleanup