Added T:W:Choice
Remove the old deprecations from the list