CC-5788 : Library Cleanup

need to also save on sorting.