Just cleaning up optional choices.