Removed redundant encryption and asserts
Merge branch 'mannol1-master'