Encryption stuff temporarily removed

Sorry about the mess. All references to the PasswordEncryptor should be removed now, until I figure out what I did.