Removed dead code and updated tests to cover 100% for crypto

Change-Id: I86ef3597321d2af54fd317021274a95173e3f3ac
Merge "Removed dead code and updated tests to cover 100% for crypto"