Two Poll components listed in channel editor component bar - one old and one new

Steps to reproduce
1) Open Go Green and go to the channel manager, edit a channel.
2) Click Add Components
Expected: One Poll component
Actual: Two Poll components

One of the Poll components is the 'classic' Poll component that has Poll sample documents in the Go Green document tree. The new component is bootstrapped but is not configured as part of the Go Green demo content