Clean up Encryptor class