more crypt simplifications