Better worldgen + cleanup script