I think removing pre-shared key mode is a very good idea, because it not only makes things simpler but it will also show that you don't need a PKI if you want to use public keys (e.g. SSH). -markus