Get rid of elementSetContainer
Get rid of elementContainer
Get rid of elementTextContainer
Get rid of elementText
Make copy of _buildItemTypeForItem

Made a copy of _buildItemTypeForItem, and commented out the
original function. Will make changes to the copy.