sml: use relationship container for leaves

- remove legacy leaves container and deal with the fallout.