Remove all encryption code part 2