Update to farming in upstream
Remove rubber trees since they are in moretrees now