Removed redundant crypto code