Add ability to remove a choice

Also, do not allow creating an empty choice