Adds choice test and removes unused code.