Remove code that does insufficient encryption.
Merge pull request #102 from eric-wu/develop

Remove code that does insufficient encryption.
Fixing merge conflict