More cleanup and restored find random