Remove some randomness. Closes #228