Clean up of Crypt class
Remove extra requirements checks.
Merge pull request #686 from designermonkey/crypt-cleanup

Clean up of Crypt class