Switch to aesrandom, remove debugging statements, cleanup