Fix '--with-transfer' login
Strip out TODO block