Clean up newEtcd per review comments