Cleaning up: no more item in the abstract nodes.
Cleaning up bugs from the change.