Begin adding economy sites to world (farm, mine); clean old unused code