Added documentation for choice.
Added the ability to remove via either api.