- removed unnecessary code
* fixed the new encrypting