Removed redundant encryption and asserts