Remove bad arbitrary and replace it where used