Clean up Question randomness