fix issue with InvalidResource error messages
fix issue regenerating private keys in Client resource
remove bits that are now located in VariaModel