Added changes to crypto code. Removed bouncy castle.