Remove superfluous class attributes.
Retire superfluous class attribute.
Clean up unit test (WIP).
Add XItem.