Some cleanup.  Randomly generated