Cleanup, move randoms out of Helper.