Replaced version2 targets, removed some testnet diff targeting